Merge remote-tracking branch 'net-next/master'

[linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 29b1e55..2d958be 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2927,6 +2927,12 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     arch/powerpc/net/
 
+BPF JIT for RISC-V (RV64G)
+M:     Björn Töpel <bjorn.topel@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     arch/riscv/net/
+
 BPF JIT for S390
 M:     Martin Schwidefsky <schwidefsky@de.ibm.com>
 M:     Heiko Carstens <heiko.carstens@de.ibm.com>
@@ -4144,7 +4150,7 @@ S:        Maintained
 F:     drivers/media/dvb-frontends/cxd2820r*
 
 CXGB3 ETHERNET DRIVER (CXGB3)
-M:     Arjun Vynipadath <arjun@chelsio.com>
+M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -4173,7 +4179,7 @@ S:        Supported
 F:     drivers/crypto/chelsio
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Arjun Vynipadath <arjun@chelsio.com>
+M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -6046,6 +6052,12 @@ L:       linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/dma/fsldma.*
 
+FREESCALE ENETC ETHERNET DRIVERS
+M:     Claudiu Manoil <claudiu.manoil@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/enetc/
+
 FREESCALE eTSEC ETHERNET DRIVER (GIANFAR)
 M:     Claudiu Manoil <claudiu.manoil@nxp.com>
 L:     netdev@vger.kernel.org
@@ -6110,6 +6122,7 @@ M:        Yangbo Lu <yangbo.lu@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/ptp/ptp_qoriq.c
+F:     drivers/ptp/ptp_qoriq_debugfs.c
 F:     include/linux/fsl/ptp_qoriq.h
 F:     Documentation/devicetree/bindings/ptp/ptp-qoriq.txt
 
@@ -10603,6 +10616,7 @@ F:      Documentation/devicetree/bindings/net/dsa/
 F:     net/dsa/
 F:     include/net/dsa.h
 F:     include/linux/dsa/
+F:     include/linux/platform_data/dsa.h
 F:     drivers/net/dsa/
 
 NETWORKING [GENERAL]
@@ -12649,6 +12663,14 @@ L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/qualcomm/emac/
 
+QUALCOMM ETHQOS ETHERNET DRIVER
+M:     Vinod Koul <vkoul@kernel.org>
+M:     Niklas Cassel <niklas.cassel@linaro.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+F:     Documentation/devicetree/bindings/net/qcom,dwmac.txt
+
 QUALCOMM GENERIC INTERFACE I2C DRIVER
 M:     Alok Chauhan <alokc@codeaurora.org>
 M:     Karthikeyan Ramasubramanian <kramasub@codeaurora.org>