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

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9a54806..a1511f7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1286,7 +1286,7 @@ S:        Supported
 F:     Documentation/devicetree/bindings/net/apm-xgene-enet.txt
 F:     Documentation/devicetree/bindings/net/apm-xgene-mdio.txt
 F:     drivers/net/ethernet/apm/xgene/
-F:     drivers/net/phy/mdio-xgene.c
+F:     drivers/net/mdio/mdio-xgene.c
 
 APPLIED MICRO (APM) X-GENE SOC PMU
 M:     Khuong Dinh <khuong@os.amperecomputing.com>
@@ -4709,6 +4709,15 @@ S:       Supported
 W:     http://www.chelsio.com
 F:     drivers/crypto/chelsio
 
+CXGB4 INLINE CRYPTO DRIVER
+M:     Ayush Sawal <ayush.sawal@chelsio.com>
+M:     Vinay Kumar Yadav <vinay.yadav@chelsio.com>
+M:     Rohit Maheshwari <rohitm@chelsio.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+W:     http://www.chelsio.com
+F:     drivers/net/ethernet/chelsio/inline_crypto/
+
 CXGB4 ETHERNET DRIVER (CXGB4)
 M:     Vishal Kulkarni <vishal@chelsio.com>
 L:     netdev@vger.kernel.org
@@ -6520,11 +6529,14 @@ F:      Documentation/devicetree/bindings/net/ethernet-phy.yaml
 F:     Documentation/devicetree/bindings/net/mdio*
 F:     Documentation/devicetree/bindings/net/qca,ar803x.yaml
 F:     Documentation/networking/phy.rst
+F:     drivers/net/mdio/
+F:     drivers/net/pcs/
 F:     drivers/net/phy/
 F:     drivers/of/of_mdio.c
 F:     drivers/of/of_net.c
 F:     include/dt-bindings/net/qca-ar803x.h
 F:     include/linux/*mdio*.h
+F:     include/linux/mdio/*.h
 F:     include/linux/of_net.h
 F:     include/linux/phy.h
 F:     include/linux/phy_fixed.h
@@ -10307,6 +10319,13 @@ S:     Maintained
 W:     http://linux-test-project.github.io/
 T:     git git://github.com/linux-test-project/ltp.git
 
+LYNX PCS MODULE
+M:     Ioana Ciornei <ioana.ciornei@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/pcs/pcs-lynx.c
+F:     include/linux/pcs-lynx.h
+
 M68K ARCHITECTURE
 M:     Geert Uytterhoeven <geert@linux-m68k.org>
 L:     linux-m68k@lists.linux-m68k.org
@@ -10514,7 +10533,7 @@ M:      Tobias Waldekranz <tobias@waldekranz.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/marvell,mvusb.yaml
-F:     drivers/net/phy/mdio-mvusb.c
+F:     drivers/net/mdio/mdio-mvusb.c
 
 MARVELL XENON MMC/SD/SDIO HOST CONTROLLER DRIVER
 M:     Hu Ziji <huziji@marvell.com>
@@ -10661,6 +10680,15 @@ L:     linux-input@vger.kernel.org
 S:     Maintained
 F:     drivers/hid/hid-mcp2221.c
 
+MCP25XXFD SPI-CAN NETWORK DRIVER
+M:     Marc Kleine-Budde <mkl@pengutronix.de>
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+R:     Thomas Kopp <thomas.kopp@microchip.com>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
+F:     drivers/net/can/spi/mcp25xxfd/
+
 MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
 M:     Peter Rosin <peda@axentia.se>
 L:     linux-iio@vger.kernel.org
@@ -12043,7 +12071,6 @@ M:      Neil Horman <nhorman@tuxdriver.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 W:     https://fedorahosted.org/dropwatch/
-F:     include/net/drop_monitor.h
 F:     include/uapi/linux/net_dropmon.h
 F:     net/core/drop_monitor.c
 
@@ -12138,6 +12165,7 @@ F:      net/ipv6/ipcomp6.c
 F:     net/ipv6/xfrm*
 F:     net/key/
 F:     net/xfrm/
+F:     tools/testing/selftests/net/ipsec.c
 
 NETWORKING [IPv4/IPv6]
 M:     "David S. Miller" <davem@davemloft.net>
@@ -12521,6 +12549,7 @@ F:      drivers/net/dsa/ocelot/*
 F:     drivers/net/ethernet/mscc/
 F:     include/soc/mscc/ocelot*
 F:     net/dsa/tag_ocelot.c
+F:     tools/testing/selftests/drivers/net/ocelot/*
 
 OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER
 M:     Frederic Barrat <fbarrat@linux.ibm.com>
@@ -15286,10 +15315,11 @@ F:    drivers/media/platform/s3c-camif/
 F:     include/media/drv-intf/s3c_camif.h
 
 SAMSUNG S3FWRN5 NFC DRIVER
-M:     Robert Baldyga <r.baldyga@samsung.com>
+M:     Krzysztof Kozlowski <krzk@kernel.org>
 M:     Krzysztof Opasiak <k.opasiak@samsung.com>
 L:     linux-nfc@lists.01.org (moderated for non-subscribers)
-S:     Supported
+S:     Maintained
+F:     Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
 F:     drivers/nfc/s3fwrn5
 
 SAMSUNG S5C73M3 CAMERA DRIVER
@@ -15674,6 +15704,7 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/phy/phylink.c
 F:     drivers/net/phy/sfp*
+F:     include/linux/mdio/mdio-i2c.h
 F:     include/linux/phylink.h
 F:     include/linux/sfp.h
 K:     phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate)
@@ -16758,8 +16789,8 @@ SYNOPSYS DESIGNWARE ETHERNET XPCS DRIVER
 M:     Jose Abreu <Jose.Abreu@synopsys.com>
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     drivers/net/phy/mdio-xpcs.c
-F:     include/linux/mdio-xpcs.h
+F:     drivers/net/pcs/pcs-xpcs.c
+F:     include/linux/pcs/pcs-xpcs.h
 
 SYNOPSYS DESIGNWARE I2C DRIVER
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>