diff options
| author | Mark Brown <broonie@kernel.org> | 2026-05-29 22:22:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-05-29 22:22:24 +0100 |
| commit | 091bddd6f3606ee19980772e41e0d5c8cb34dce7 (patch) | |
| tree | f6f9c17ea6c1aa02dc2ca7549ef44311221ab779 /MAINTAINERS | |
| parent | d020f44bb364ba5456cdb834ebe68773ce9ff02b (diff) | |
| parent | 8415598365503ced2e3d019491b0a2756c85c494 (diff) | |
| download | linux-next-history-091bddd6f3606ee19980772e41e0d5c8cb34dce7.tar.gz | |
Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 04658a1506cf3..c438167b2604b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -808,6 +808,14 @@ S: Maintained F: Documentation/i2c/busses/i2c-ali1563.rst F: drivers/i2c/busses/i2c-ali1563.c +ALIBABA ELASTIC ETHERNET ADAPTER DRIVER +M: Xuan Zhuo <xuanzhuo@linux.alibaba.com> +M: Wen Gu <guwen@linux.alibaba.com> +R: Philo Lu <lulie@linux.alibaba.com> +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/alibaba/eea + ALIBABA ELASTIC RDMA DRIVER M: Cheng Xu <chengyou@linux.alibaba.com> M: Kai Shen <kaishen@linux.alibaba.com> @@ -15431,7 +15439,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git F: Documentation/networking/mac80211-injection.rst F: Documentation/networking/mac80211_hwsim/mac80211_hwsim.rst -F: drivers/net/wireless/virtual/mac80211_hwsim.[ch] +F: drivers/net/wireless/virtual/mac80211_hwsim*.[ch] F: include/net/mac80211.h F: net/mac80211/ @@ -18580,7 +18588,6 @@ F: include/linux/fddidevice.h F: include/linux/if_* F: include/linux/inetdevice.h F: include/linux/netdev* -F: include/linux/platform_data/wiznet.h F: include/uapi/linux/cn_proc.h F: include/uapi/linux/ethtool_netlink* F: include/uapi/linux/if_* @@ -19395,6 +19402,17 @@ F: Documentation/devicetree/bindings/clock/*imx* F: drivers/clk/imx/ F: include/dt-bindings/clock/*imx* +NXP NETC ETHERNET SWITCH DRIVER +M: Wei Fang <wei.fang@nxp.com> +R: Clark Wang <xiaoning.wang@nxp.com> +L: imx@lists.linux.dev +L: netdev@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/net/dsa/nxp,netc-switch.yaml +F: drivers/net/dsa/netc/ +F: include/linux/dsa/tag_netc.h +F: net/dsa/tag_netc.c + NXP NETC TIMER PTP CLOCK DRIVER M: Wei Fang <wei.fang@nxp.com> M: Clark Wang <xiaoning.wang@nxp.com> @@ -20237,6 +20255,7 @@ M: Christian Lamparter <chunkeey@googlemail.com> L: linux-wireless@vger.kernel.org S: Maintained W: https://wireless.wiki.kernel.org/en/users/Drivers/p54 +F: Documentation/devicetree/bindings/net/wireless/st,stlc4560.yaml F: drivers/net/wireless/intersil/ PACKET SOCKETS |