Merge tag 'net-next-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 19d783e..f326718 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3204,7 +3204,7 @@ S:        Maintained
 W:     https://www.open-mesh.org/
 Q:     https://patchwork.open-mesh.org/project/batman/list/
 B:     https://www.open-mesh.org/projects/batman-adv/issues
-C:     irc://chat.freenode.net/batman
+C:     ircs://irc.hackint.org/batadv
 T:     git https://git.open-mesh.org/linux-merge.git
 F:     Documentation/networking/batman-adv.rst
 F:     include/uapi/linux/batadv_packet.h
@@ -3416,7 +3416,6 @@ F:        drivers/net/ethernet/netronome/nfp/bpf/
 
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:     Naveen N. Rao <naveen.n.rao@linux.ibm.com>
-M:     Sandipan Das <sandipan@linux.ibm.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -5702,6 +5701,7 @@ DPAA2 ETHERNET SWITCH DRIVER
 M:     Ioana Ciornei <ioana.ciornei@nxp.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
+F:     Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-driver.rst
 F:     drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
 F:     drivers/net/ethernet/freescale/dpaa2/dpsw*
 
@@ -6922,6 +6922,12 @@ M:       Mark Einon <mark.einon@gmail.com>
 S:     Odd Fixes
 F:     drivers/net/ethernet/agere/
 
+ETAS ES58X CAN/USB DRIVER
+M:     Vincent Mailhol <mailhol.vincent@wanadoo.fr>
+L:     linux-can@vger.kernel.org
+S:     Maintained
+F:     drivers/net/can/usb/etas_es58x/
+
 ETHERNET BRIDGE
 M:     Roopa Prabhu <roopa@nvidia.com>
 M:     Nikolay Aleksandrov <nikolay@nvidia.com>
@@ -9767,11 +9773,6 @@ M:       David Sterba <dsterba@suse.com>
 S:     Odd Fixes
 F:     drivers/tty/ipwireless/
 
-IPX NETWORK LAYER
-L:     netdev@vger.kernel.org
-S:     Obsolete
-F:     include/uapi/linux/ipx.h
-
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 M:     Marc Zyngier <maz@kernel.org>
 S:     Maintained
@@ -10417,6 +10418,7 @@ F:      net/core/skmsg.c
 F:     net/core/sock_map.c
 F:     net/ipv4/tcp_bpf.c
 F:     net/ipv4/udp_bpf.c
+F:     net/unix/unix_bpf.c
 
 LANDLOCK SECURITY MODULE
 M:     Mickaël Salaün <mic@digikod.net>
@@ -11050,6 +11052,18 @@ F:     drivers/mailbox/arm_mhuv2.c
 F:     include/linux/mailbox/arm_mhuv2_message.h
 F:     Documentation/devicetree/bindings/mailbox/arm,mhuv2.yaml
 
+MANAGEMENT COMPONENT TRANSPORT PROTOCOL (MCTP)
+M:     Jeremy Kerr <jk@codeconstruct.com.au>
+M:     Matt Johnston <matt@codeconstruct.com.au>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     Documentation/networking/mctp.rst
+F:     drivers/net/mctp/
+F:     include/net/mctp.h
+F:     include/net/mctpdevice.h
+F:     include/net/netns/mctp.h
+F:     net/mctp/
+
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 M:     Michael Kerrisk <mtk.manpages@gmail.com>
 L:     linux-man@vger.kernel.org
@@ -11347,6 +11361,12 @@ W:     https://linuxtv.org
 T:     git git://linuxtv.org/media_tree.git
 F:     drivers/media/radio/radio-maxiradio*
 
+MAXLINEAR ETHERNET PHY DRIVER
+M:     Xu Liang <lxu@maxlinear.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/phy/mxl-gpy.c
+
 MCBA MICROCHIP CAN BUS ANALYZER TOOL DRIVER
 R:     Yasushi SHOJI <yashi@spacecubics.com>
 L:     linux-can@vger.kernel.org
@@ -13890,6 +13910,12 @@ F:     Documentation/devicetree/
 F:     arch/*/boot/dts/
 F:     include/dt-bindings/
 
+OPENCOMPUTE PTP CLOCK DRIVER
+M:     Jonathan Lemon <jonathan.lemon@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/ptp/ptp_ocp.c
+
 OPENCORES I2C BUS DRIVER
 M:     Peter Korsgaard <peter@korsgaard.com>
 M:     Andrew Lunn <andrew@lunn.ch>
@@ -14953,13 +14979,6 @@ S:     Maintained
 F:     include/linux/printk.h
 F:     kernel/printk/
 
-PRISM54 WIRELESS DRIVER
-M:     Luis Chamberlain <mcgrof@kernel.org>
-L:     linux-wireless@vger.kernel.org
-S:     Obsolete
-W:     https://wireless.wiki.kernel.org/en/users/Drivers/p54
-F:     drivers/net/wireless/intersil/prism54/
-
 PROC FILESYSTEM
 L:     linux-kernel@vger.kernel.org
 L:     linux-fsdevel@vger.kernel.org