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

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 84d6a8277cbde11208b197549d12f505556b87cf..2db0f8cd4002f5fd2ba389d1aed53e29de79032a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2477,7 +2477,7 @@ Q:        https://patchwork.open-mesh.org/project/batman/list/
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-class-net-batman-adv
 F:     Documentation/ABI/testing/sysfs-class-net-mesh
-F:     Documentation/networking/batman-adv.txt
+F:     Documentation/networking/batman-adv.rst
 F:     include/uapi/linux/batman_adv.h
 F:     net/batman-adv/
 
@@ -5101,6 +5101,7 @@ F:        include/linux/of_net.h
 F:     include/linux/phy.h
 F:     include/linux/phy_fixed.h
 F:     include/linux/platform_data/mdio-gpio.h
+F:     include/linux/platform_data/mdio-bcm-unimac.h
 F:     include/trace/events/mdio.h
 F:     include/uapi/linux/mdio.h
 F:     include/uapi/linux/mii.h
@@ -6147,6 +6148,14 @@ S:       Maintained
 F:     drivers/net/ethernet/hisilicon/
 F:     Documentation/devicetree/bindings/net/hisilicon*.txt
 
+HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)
+M:     Yisen Zhuang <yisen.zhuang@huawei.com>
+M:     Salil Mehta <salil.mehta@huawei.com>
+L:     netdev@vger.kernel.org
+W:     http://www.hisilicon.com
+S:     Maintained
+F:     drivers/net/ethernet/hisilicon/hns3/
+
 HISILICON ROCE DRIVER
 M:     Lijun Ou <oulijun@huawei.com>
 M:     Wei Hu(Xavier) <xavier.huwei@huawei.com>
@@ -6257,6 +6266,7 @@ M:        Haiyang Zhang <haiyangz@microsoft.com>
 M:     Stephen Hemminger <sthemmin@microsoft.com>
 L:     devel@linuxdriverproject.org
 S:     Maintained
+F:     Documentation/networking/netvsc.txt
 F:     arch/x86/include/asm/mshyperv.h
 F:     arch/x86/include/uapi/asm/hyperv.h
 F:     arch/x86/kernel/cpu/mshyperv.c
@@ -8424,7 +8434,9 @@ F:        include/uapi/linux/uvcvideo.h
 
 MEDIATEK ETHERNET DRIVER
 M:     Felix Fietkau <nbd@openwrt.org>
-M:     John Crispin <blogic@openwrt.org>
+M:     John Crispin <john@phrozen.org>
+M:     Sean Wang <sean.wang@mediatek.com>
+M:     Nelson Chang <nelson.chang@mediatek.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/mediatek/