Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 08176d64eed5afd0a8c024ce74d0f5b0b22c42f4..a406947b369ebd1fe41866049691f6e7f65543e7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -938,6 +938,14 @@ S: Supported
 F:     drivers/mux/adgs1408.c
 F:     Documentation/devicetree/bindings/mux/adi,adgs1408.txt
 
+ANALOG DEVICES INC ADIN DRIVER
+M:     Alexandru Ardelean <alexaundru.ardelean@analog.com>
+L:     netdev@vger.kernel.org
+W:     http://ez.analog.com/community/linux-device-drivers
+S:     Supported
+F:     drivers/net/phy/adin.c
+F:     Documentation/devicetree/bindings/net/adi,adin.yaml
+
 ANALOG DEVICES INC ADIS DRIVER LIBRARY
 M:     Alexandru Ardelean <alexandru.ardelean@analog.com>
 S:     Supported
@@ -3635,9 +3643,12 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/net/can/
 F:     drivers/net/can/
 F:     include/linux/can/dev.h
+F:     include/linux/can/led.h
+F:     include/linux/can/rx-offload.h
 F:     include/linux/can/platform/
 F:     include/uapi/linux/can/error.h
 F:     include/uapi/linux/can/netlink.h
+F:     include/uapi/linux/can/vxcan.h
 
 CAN NETWORK LAYER
 M:     Oliver Hartkopp <socketcan@hartkopp.net>
@@ -3650,6 +3661,8 @@ S:        Maintained
 F:     Documentation/networking/can.rst
 F:     net/can/
 F:     include/linux/can/core.h
+F:     include/linux/can/skb.h
+F:     include/net/netns/can.h
 F:     include/uapi/linux/can.h
 F:     include/uapi/linux/can/bcm.h
 F:     include/uapi/linux/can/raw.h
@@ -11158,6 +11171,7 @@ S:      Maintained
 W:     https://fedorahosted.org/dropwatch/
 F:     net/core/drop_monitor.c
 F:     include/uapi/linux/net_dropmon.h
+F:     include/net/drop_monitor.h
 
 NETWORKING DRIVERS
 M:     "David S. Miller" <davem@davemloft.net>
@@ -11337,7 +11351,6 @@ F:      include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     drivers/nfc/
 F:     include/linux/platform_data/nfcmrvl.h
-F:     include/linux/platform_data/nxp-nci.h
 F:     Documentation/devicetree/bindings/net/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
@@ -13232,7 +13245,7 @@ M:      Manish Chopra <manishc@marvell.com>
 M:     GR-Linux-NIC-Dev@marvell.com
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     drivers/net/ethernet/qlogic/qlge/
+F:     drivers/staging/qlge/
 
 QM1D1B0004 MEDIA DRIVER
 M:     Akihiro Tsukada <tskd08@gmail.com>