Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bc88786..2f12abc 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3197,7 +3197,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
@@ -3865,6 +3865,16 @@ L:       bcm-kernel-feedback-list@broadcom.com
 S:     Maintained
 F:     drivers/mtd/nand/raw/brcmnand/
 
+BROADCOM STB PCIE DRIVER
+M:     Jim Quinlan <jim2101024@gmail.com>
+M:     Nicolas Saenz Julienne <nsaenz@kernel.org>
+M:     Florian Fainelli <f.fainelli@gmail.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
+F:     drivers/pci/controller/pcie-brcmstb.c
+
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     bcm-kernel-feedback-list@broadcom.com
@@ -4497,7 +4507,7 @@ L:        clang-built-linux@googlegroups.com
 S:     Supported
 W:     https://clangbuiltlinux.github.io/
 B:     https://github.com/ClangBuiltLinux/linux/issues
-C:     irc://chat.freenode.net/clangbuiltlinux
+C:     irc://irc.libera.chat/clangbuiltlinux
 F:     Documentation/kbuild/llvm.rst
 F:     include/linux/compiler-clang.h
 F:     scripts/clang-tools/
@@ -6904,6 +6914,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>
@@ -6945,7 +6961,7 @@ F:        include/uapi/linux/mdio.h
 F:     include/uapi/linux/mii.h
 
 EXFAT FILE SYSTEM
-M:     Namjae Jeon <namjae.jeon@samsung.com>
+M:     Namjae Jeon <linkinjeon@kernel.org>
 M:     Sungjong Seo <sj1557.seo@samsung.com>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
@@ -9749,11 +9765,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
@@ -13889,6 +13900,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>
@@ -14449,6 +14466,13 @@ S:     Maintained
 F:     Documentation/devicetree/bindings/pci/hisilicon-histb-pcie.txt
 F:     drivers/pci/controller/dwc/pcie-histb.c
 
+PCIE DRIVER FOR INTEL LGM GW SOC
+M:     Rahul Tanwar <rtanwar@maxlinear.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/intel-gw-pcie.yaml
+F:     drivers/pci/controller/dwc/pcie-intel-gw.c
+
 PCIE DRIVER FOR MEDIATEK
 M:     Ryder Lee <ryder.lee@mediatek.com>
 M:     Jianjun Wang <jianjun.wang@mediatek.com>
@@ -14945,13 +14969,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