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

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f6c3466..f4b944c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -636,6 +636,15 @@ F: drivers/tty/serial/altera_jtaguart.c
 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>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     Documentation/networking/ena.txt
+F:     drivers/net/ethernet/amazon/
+
 AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
 M:     Gary Hook <gary.hook@amd.com>
@@ -3139,7 +3148,7 @@ L:        cocci@systeme.lip6.fr (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
 W:     http://coccinelle.lip6.fr/
 S:     Supported
-F:     Documentation/coccinelle.txt
+F:     Documentation/dev-tools/coccinelle.rst
 F:     scripts/coccinelle/
 F:     scripts/coccicheck
 
@@ -5148,7 +5157,7 @@ GCOV BASED KERNEL PROFILING
 M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 S:     Maintained
 F:     kernel/gcov/
-F:     Documentation/gcov.txt
+F:     Documentation/dev-tools/gcov.rst
 
 GDT SCSI DISK ARRAY CONTROLLER DRIVER
 M:     Achim Leubner <achim_leubner@adaptec.com>
@@ -5596,10 +5605,9 @@ F:       Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
 
 HOST AP DRIVER
 M:     Jouni Malinen <j@w1.fi>
-L:     hostap@shmoo.com (subscribers-only)
 L:     linux-wireless@vger.kernel.org
-W:     http://hostap.epitest.fi/
-S:     Maintained
+W:     http://w1.fi/hostap-driver.html
+S:     Obsolete
 F:     drivers/net/wireless/intersil/hostap/
 
 HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
@@ -5636,7 +5644,7 @@ M:        Sebastian Reichel <sre@kernel.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-hsi
-F:     Documentation/hsi.txt
+F:     Documentation/device-drivers/serial-interfaces.rst
 F:     drivers/hsi/
 F:     include/linux/hsi/
 F:     include/uapi/linux/hsi/
@@ -6617,7 +6625,7 @@ L:        kasan-dev@googlegroups.com
 S:     Maintained
 F:     arch/*/include/asm/kasan.h
 F:     arch/*/mm/kasan_init*
-F:     Documentation/kasan.txt
+F:     Documentation/dev-tools/kasan.rst
 F:     include/linux/kasan*.h
 F:     lib/test_kasan.c
 F:     mm/kasan/
@@ -6833,7 +6841,7 @@ KMEMCHECK
 M:     Vegard Nossum <vegardno@ifi.uio.no>
 M:     Pekka Enberg <penberg@kernel.org>
 S:     Maintained
-F:     Documentation/kmemcheck.txt
+F:     Documentation/dev-tools/kmemcheck.rst
 F:     arch/x86/include/asm/kmemcheck.h
 F:     arch/x86/mm/kmemcheck/
 F:     include/linux/kmemcheck.h
@@ -6842,7 +6850,7 @@ F:        mm/kmemcheck.c
 KMEMLEAK
 M:     Catalin Marinas <catalin.marinas@arm.com>
 S:     Maintained
-F:     Documentation/kmemleak.txt
+F:     Documentation/dev-tools/kmemleak.rst
 F:     include/linux/kmemleak.h
 F:     mm/kmemleak.c
 F:     mm/kmemleak-test.c
@@ -9731,6 +9739,12 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 S:     Supported
 F:     drivers/net/wireless/ath/ath10k/
 
+QUALCOMM EMAC GIGABIT ETHERNET DRIVER
+M:     Timur Tabi <timur@codeaurora.org>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/qualcomm/emac/
+
 QUALCOMM HEXAGON ARCHITECTURE
 M:     Richard Kuo <rkuo@codeaurora.org>
 L:     linux-hexagon@vger.kernel.org
@@ -9992,6 +10006,7 @@ F:       net/rfkill/
 
 RHASHTABLE
 M:     Thomas Graf <tgraf@suug.ch>
+M:     Herbert Xu <herbert@gondor.apana.org.au>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     lib/rhashtable.c
@@ -10135,8 +10150,8 @@ S:      Supported
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
-M:     Stefan Weinhuber <wein@de.ibm.com>
-M:     Stefan Haberland <stefan.haberland@de.ibm.com>
+M:     Stefan Haberland <sth@linux.vnet.ibm.com>
+M:     Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
@@ -12332,6 +12347,7 @@ F:      drivers/net/usb/smsc75xx.*
 
 USB SMSC95XX ETHERNET DRIVER
 M:     Steve Glendinning <steve.glendinning@shawell.net>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/usb/smsc95xx.*