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

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ceeb7ceae041c5e32f722db6a802d1ccf7d4a2c1..dd39fc578607ab34f2c0159d53dc8d07e3f3275c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -944,6 +944,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
@@ -2921,6 +2929,7 @@ BATMAN ADVANCED
 M:     Marek Lindner <mareklindner@neomailbox.ch>
 M:     Simon Wunderlich <sw@simonwunderlich.de>
 M:     Antonio Quartulli <a@unstable.cc>
+M:     Sven Eckelmann <sven@narfation.org>
 L:     b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)
 W:     https://www.open-mesh.org/
 B:     https://www.open-mesh.org/projects/batman-adv/issues
@@ -3641,9 +3650,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>
@@ -3656,11 +3668,23 @@ 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
 F:     include/uapi/linux/can/gw.h
 
+CAN-J1939 NETWORK LAYER
+M:     Robin van der Gracht <robin@protonic.nl>
+M:     Oleksij Rempel <o.rempel@pengutronix.de>
+R:     Pengutronix Kernel Team <kernel@pengutronix.de>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     Documentation/networking/j1939.txt
+F:     net/can/j1939/
+F:     include/uapi/linux/can/j1939.h
+
 CAPABILITIES
 M:     Serge Hallyn <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org
@@ -5564,12 +5588,6 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/radio/dsbr100.c
 
-DSCC4 DRIVER
-M:     Francois Romieu <romieu@fr.zoreil.com>
-L:     netdev@vger.kernel.org
-S:     Maintained
-F:     drivers/net/wan/dscc4.c
-
 DT3155 MEDIA DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -7462,6 +7480,7 @@ F:        drivers/hid/hid-hyperv.c
 F:     drivers/hv/
 F:     drivers/input/serio/hyperv-keyboard.c
 F:     drivers/pci/controller/pci-hyperv.c
+F:     drivers/pci/controller/pci-hyperv-intf.c
 F:     drivers/net/hyperv/
 F:     drivers/scsi/storvsc_drv.c
 F:     drivers/uio/uio_hv_generic.c
@@ -11172,6 +11191,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>
@@ -11351,7 +11371,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
@@ -12599,6 +12618,14 @@ L:     platform-driver-x86@vger.kernel.org
 S:     Maintained
 F:     drivers/platform/x86/peaq-wmi.c
 
+PENSANDO ETHERNET DRIVERS
+M:     Shannon Nelson <snelson@pensando.io>
+M:     Pensando Drivers <drivers@pensando.io>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/networking/device_drivers/pensando/ionic.rst
+F:     drivers/net/ethernet/pensando/
+
 PER-CPU MEMORY ALLOCATOR
 M:     Dennis Zhou <dennis@kernel.org>
 M:     Tejun Heo <tj@kernel.org>
@@ -13246,7 +13273,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>