sctp: fix GSO for IPv6

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d8c0784..06e8411 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2297,6 +2297,7 @@ 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:     include/uapi/linux/batman_adv.h
 F:     net/batman-adv/
 
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@ -5437,6 +5438,15 @@ F:       include/uapi/linux/if_hippi.h
 F:     net/802/hippi.c
 F:     drivers/net/hippi/
 
+HISILICON NETWORK SUBSYSTEM DRIVER
+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/
+F:     Documentation/devicetree/bindings/net/hisilicon*.txt
+
 HISILICON SAS Controller
 M:     John Garry <john.garry@huawei.com>
 W:     http://www.hisilicon.com
@@ -9549,7 +9559,7 @@ M:        Florian Fainelli <florian@openwrt.org>
 S:     Maintained
 
 RDC R6040 FAST ETHERNET DRIVER
-M:     Florian Fainelli <florian@openwrt.org>
+M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/rdc/r6040.c
@@ -9700,7 +9710,6 @@ F:        Documentation/ABI/*/sysfs-driver-hid-roccat*
 
 ROCKER DRIVER
 M:     Jiri Pirko <jiri@resnulli.us>
-M:     Scott Feldman <sfeldma@gmail.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/rocker/