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

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 00b0fda6c2e1ea2da173512e389e9aa5afbd55cb..d20c9a483c42e5cfaf93f1fa16209d7e512f2b41 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -700,9 +700,9 @@ F:  include/linux/altera_uart.h
 F:     include/linux/altera_jtaguart.h
 
 AMAZON ETHERNET DRIVERS
-M:     Netanel Belgazal <netanel@annapurnalabs.com>
-R:     Saeed Bishara <saeed@annapurnalabs.com>
-R:     Zorik Machulsky <zorik@annapurnalabs.com>
+M:     Netanel Belgazal <netanel@amazon.com>
+R:     Saeed Bishara <saeedb@amazon.com>
+R:     Zorik Machulsky <zorik@amazon.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/ena.txt
@@ -2713,6 +2713,7 @@ L:        linux-kernel@vger.kernel.org
 S:     Supported
 F:     arch/x86/net/bpf_jit*
 F:     Documentation/networking/filter.txt
+F:     Documentation/bpf/
 F:     include/linux/bpf*
 F:     include/linux/filter.h
 F:     include/uapi/linux/bpf*
@@ -2725,7 +2726,7 @@ F:        net/core/filter.c
 F:     net/sched/act_bpf.c
 F:     net/sched/cls_bpf.c
 F:     samples/bpf/
-F:     tools/net/bpf*
+F:     tools/bpf/
 F:     tools/testing/selftests/bpf/
 
 BROADCOM B44 10/100 ETHERNET DRIVER
@@ -2897,6 +2898,7 @@ F:        drivers/gpio/gpio-brcmstb.c
 F:     Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
 
 BROADCOM GENET ETHERNET DRIVER
+M:     Doug Berger <opendmb@gmail.com>
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -3329,17 +3331,22 @@ S:      Maintained
 F:     drivers/auxdisplay/cfag12864bfb.c
 F:     include/linux/cfag12864b.h
 
-CFG80211 and NL80211
+802.11 (including CFG80211/NL80211)
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
+F:     net/wireless/
 F:     include/uapi/linux/nl80211.h
+F:     include/linux/ieee80211.h
+F:     include/net/wext.h
 F:     include/net/cfg80211.h
-F:     net/wireless/*
-X:     net/wireless/wext*
+F:     include/net/iw_handler.h
+F:     include/net/ieee80211_radiotap.h
+F:     Documentation/driver-api/80211/cfg80211.rst
+F:     Documentation/networking/regulatory.txt
 
 CHAR and MISC DRIVERS
 M:     Arnd Bergmann <arnd@arndb.de>
@@ -3415,7 +3422,7 @@ F:        drivers/scsi/snic/
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
 M:     Govindarajulu Varadarajan <_govind@gmx.com>
-M:     Neel Patel <neepatel@cisco.com>
+M:     Parvi Kaustubhi <pkaustub@cisco.com>
 S:     Supported
 F:     drivers/net/ethernet/cisco/enic/
 
@@ -8208,6 +8215,7 @@ F:        Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 F:     drivers/net/wireless/mac80211_hwsim.[ch]
+F:     Documentation/networking/mac80211_hwsim/README
 
 MAILBOX API
 M:     Jassi Brar <jassisinghbrar@gmail.com>
@@ -9408,6 +9416,7 @@ M:        Florian Fainelli <f.fainelli@gmail.com>
 S:     Maintained
 F:     net/dsa/
 F:     include/net/dsa.h
+F:     include/linux/dsa/
 F:     drivers/net/dsa/
 
 NETWORKING [GENERAL]
@@ -9428,8 +9437,8 @@ F:        include/uapi/linux/in.h
 F:     include/uapi/linux/net.h
 F:     include/uapi/linux/netdevice.h
 F:     include/uapi/linux/net_namespace.h
-F:     tools/net/
 F:     tools/testing/selftests/net/
+F:     lib/net_utils.c
 F:     lib/random32.c
 
 NETWORKING [IPSEC]
@@ -11493,6 +11502,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
 F:     Documentation/rfkill.txt
+F:     Documentation/ABI/stable/sysfs-class-rfkill
 F:     net/rfkill/
 
 RHASHTABLE
@@ -13291,6 +13301,15 @@ M:     Mika Westerberg <mika.westerberg@linux.intel.com>
 M:     Yehezkel Bernat <yehezkel.bernat@intel.com>
 S:     Maintained
 F:     drivers/thunderbolt/
+F:     include/linux/thunderbolt.h
+
+THUNDERBOLT NETWORK DRIVER
+M:     Michael Jamet <michael.jamet@intel.com>
+M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+M:     Yehezkel Bernat <yehezkel.bernat@intel.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/thunderbolt.c
 
 THUNDERX GPIO DRIVER
 M:     David Daney <david.daney@cavium.com>
@@ -14279,12 +14298,15 @@ S:    Maintained
 F:     include/linux/virtio_vsock.h
 F:     include/uapi/linux/virtio_vsock.h
 F:     include/uapi/linux/vsockmon.h
+F:     include/uapi/linux/vm_sockets_diag.h
+F:     net/vmw_vsock/diag.c
 F:     net/vmw_vsock/af_vsock_tap.c
 F:     net/vmw_vsock/virtio_transport_common.c
 F:     net/vmw_vsock/virtio_transport.c
 F:     drivers/net/vsockmon.c
 F:     drivers/vhost/vsock.c
 F:     drivers/vhost/vsock.h
+F:     tools/testing/vsock/
 
 VIRTIO CONSOLE DRIVER
 M:     Amit Shah <amit@kernel.org>