Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b74014994f5c1cc17468b05b77349a5476084b1..cb30e6b85b578af1a827da7c7673ac32a33cdbbf 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6098,7 +6098,7 @@ S:        Supported
 F:     Documentation/networking/devlink
 F:     include/net/devlink.h
 F:     include/uapi/linux/devlink.h
-F:     net/core/devlink.c
+F:     net/devlink/
 
 DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT
 M:     Christoph Niedermaier <cniedermaier@dh-electronics.com>
@@ -13708,6 +13708,7 @@ S:      Maintained
 F:     Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
 F:     Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
 F:     drivers/net/dsa/microchip/*
+F:     include/linux/dsa/ksz_common.h
 F:     include/linux/platform_data/microchip-ksz.h
 F:     net/dsa/tag_ksz.c
 
@@ -14540,6 +14541,8 @@ M:      Florian Fainelli <f.fainelli@gmail.com>
 M:     Vladimir Oltean <olteanv@gmail.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/dsa/
+F:     Documentation/devicetree/bindings/net/ethernet-switch-port.yaml
+F:     Documentation/devicetree/bindings/net/ethernet-switch.yaml
 F:     drivers/net/dsa/
 F:     include/linux/dsa/
 F:     include/linux/platform_data/dsa.h
@@ -14558,8 +14561,10 @@ Q:     https://patchwork.kernel.org/project/netdevbpf/list/
 B:     mailto:netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git
+F:     Documentation/core-api/netlink.rst
 F:     Documentation/networking/
 F:     Documentation/process/maintainer-netdev.rst
+F:     Documentation/userspace-api/netlink/
 F:     include/linux/in.h
 F:     include/linux/net.h
 F:     include/linux/netdevice.h
@@ -14571,6 +14576,7 @@ F:      include/uapi/linux/netdevice.h
 F:     lib/net_utils.c
 F:     lib/random32.c
 F:     net/
+F:     tools/net/
 F:     tools/testing/selftests/net/
 
 NETWORKING [IPSEC]
@@ -14632,7 +14638,6 @@ F:      net/netfilter/xt_SECMARK.c
 F:     net/netlabel/
 
 NETWORKING [MPTCP]
-M:     Mat Martineau <mathew.j.martineau@linux.intel.com>
 M:     Matthieu Baerts <matthieu.baerts@tessares.net>
 L:     netdev@vger.kernel.org
 L:     mptcp@lists.linux.dev
@@ -15583,6 +15588,13 @@ L:     linux-mips@vger.kernel.org
 S:     Maintained
 F:     arch/mips/boot/dts/ralink/omega2p.dts
 
+ONSEMI ETHERNET PHY DRIVERS
+M:     Piergiorgio Beruto <piergiorgio.beruto@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+W:     http://www.onsemi.com
+F:     drivers/net/phy/ncn*
+
 OP-TEE DRIVER
 M:     Jens Wiklander <jens.wiklander@linaro.org>
 L:     op-tee@lists.trustedfirmware.org
@@ -16628,6 +16640,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
 F:     drivers/iio/chemical/pms7003.c
 
+PLCA RECONCILIATION SUBLAYER (IEEE802.3 Clause 148)
+M:     Piergiorgio Beruto <piergiorgio.beruto@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/phy/mdio-open-alliance.h
+F:     net/ethtool/plca.c
+
 PLDMFW LIBRARY
 M:     Jacob Keller <jacob.e.keller@intel.com>
 S:     Maintained
@@ -20787,7 +20806,7 @@ M:      Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Yehezkel Bernat <YehezkelShB@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     drivers/net/thunderbolt.c
+F:     drivers/net/thunderbolt/
 
 THUNDERX GPIO DRIVER
 M:     Robert Richter <rric@kernel.org>