Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ad0e34bf84532a142e7cc087b5bc4b636e747f58..b15514a770e3c5e8691567ba804995b499f75bb0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -203,8 +203,8 @@ F:  include/uapi/linux/nl80211.h
 F:     net/wireless/
 
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
-M:     Realtek linux nic maintainers <[email protected]>
 M:     Heiner Kallweit <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/ethernet/realtek/r8169*
@@ -2119,7 +2119,7 @@ N:        atmel
 ARM/Microchip Sparx5 SoC support
 M:     Lars Povlsen <[email protected]>
 M:     Steen Hegelund <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
+M:     [email protected]
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
 T:     git git://github.com/microchip-ung/linux-upstream.git
@@ -3199,6 +3199,7 @@ S:        Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 F:     block/
 F:     drivers/block/
+F:     fs/block_dev.c
 F:     include/linux/blk*
 F:     kernel/trace/blktrace.c
 F:     lib/sbitmap.c
@@ -3555,7 +3556,7 @@ S:        Supported
 F:     drivers/net/ethernet/broadcom/bnxt/
 
 BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
-M:     Arend van Spriel <arend.vanspriel@broadcom.com>
+M:     Arend van Spriel <aspriel@gmail.com>
 M:     Franky Lin <[email protected]>
 M:     Hante Meuleman <[email protected]>
 M:     Chi-hsien Lin <[email protected]>
@@ -3960,7 +3961,7 @@ F:        net/can/
 CAN-J1939 NETWORK LAYER
 M:     Robin van der Gracht <[email protected]>
 M:     Oleksij Rempel <[email protected]>
-R:     Pengutronix Kernel Team <[email protected]>
+R:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     Documentation/networking/j1939.rst
@@ -4354,8 +4355,8 @@ T:        git git://linuxtv.org/media_tree.git
 F:     drivers/media/pci/cobalt/
 
 COCCINELLE/Semantic Patches (SmPL)
-M:     Julia Lawall <Julia.Lawall@lip6.fr>
-M:     Gilles Muller <Gilles.Muller@lip6.fr>
+M:     Julia Lawall <Julia.Lawall@inria.fr>
+M:     Gilles Muller <Gilles.Muller@inria.fr>
 M:     Nicolas Palix <[email protected]>
 M:     Michal Marek <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
@@ -4587,7 +4588,7 @@ B:        https://bugzilla.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 F:     Documentation/admin-guide/pm/cpuidle.rst
 F:     Documentation/driver-api/pm/cpuidle.rst
-F:     drivers/cpuidle/*
+F:     drivers/cpuidle/
 F:     include/linux/cpuidle.h
 
 CPU POWER MONITORING SUBSYSTEM
@@ -10846,7 +10847,7 @@ F:      drivers/media/radio/radio-maxiradio*
 
 MCAN MMIO DEVICE DRIVER
 M:     Dan Murphy <[email protected]>
-M:     Sriram Dash <sriram.dash@samsung.com>
+M:     Pankaj Sharma <pankj.sharma@samsung.com>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/can/bosch,m_can.yaml
@@ -11666,7 +11667,7 @@ F:      drivers/media/platform/atmel/atmel-isi.h
 
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 M:     Woojung Huh <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@ -11676,7 +11677,7 @@ F:      net/dsa/tag_ksz.c
 
 MICROCHIP LAN743X ETHERNET DRIVER
 M:     Bryan Whitehead <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/ethernet/microchip/lan743x_*
@@ -11770,7 +11771,7 @@ F:      drivers/net/wireless/microchip/wilc1000/
 
 MICROSEMI MIPS SOCS
 M:     Alexandre Belloni <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     Documentation/devicetree/bindings/mips/mscc.txt
@@ -12824,10 +12825,10 @@ F:    tools/objtool/
 F:     include/linux/objtool.h
 
 OCELOT ETHERNET SWITCH DRIVER
-M:     Microchip Linux Driver Support <[email protected]>
 M:     Vladimir Oltean <[email protected]>
 M:     Claudiu Manoil <[email protected]>
 M:     Alexandre Belloni <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/net/dsa/ocelot/*
@@ -13889,7 +13890,7 @@ F:      drivers/platform/x86/peaq-wmi.c
 
 PENSANDO ETHERNET DRIVERS
 M:     Shannon Nelson <[email protected]>
-M:     Pensando Drivers <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     Documentation/networking/device_drivers/ethernet/pensando/ionic.rst
@@ -14668,7 +14669,7 @@ T:      git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 F:     drivers/net/wireless/ath/ath11k/
 
 QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
-M:     QCA ath9k Development <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/ath9k
@@ -16916,6 +16917,22 @@ M:     Ion Badulescu <[email protected]>
 S:     Odd Fixes
 F:     drivers/net/ethernet/adaptec/starfire*
 
+STATIC BRANCH/CALL
+M:     Peter Zijlstra <[email protected]>
+M:     Josh Poimboeuf <[email protected]>
+M:     Jason Baron <[email protected]>
+R:     Steven Rostedt <[email protected]>
+R:     Ard Biesheuvel <[email protected]>
+S:     Supported
+F:     arch/*/include/asm/jump_label*.h
+F:     arch/*/include/asm/static_call*.h
+F:     arch/*/kernel/jump_label.c
+F:     arch/*/kernel/static_call.c
+F:     include/linux/jump_label*.h
+F:     include/linux/static_call*.h
+F:     kernel/jump_label.c
+F:     kernel/static_call.c
+
 STEC S1220 SKD DRIVER
 M:     Damien Le Moal <[email protected]>
 L:     [email protected]
@@ -18353,7 +18370,7 @@ F:      include/linux/usb/isp116x.h
 
 USB LAN78XX ETHERNET DRIVER
 M:     Woojung Huh <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     Documentation/devicetree/bindings/net/microchip,lan78xx.txt
@@ -18467,7 +18484,7 @@ F:      drivers/net/usb/smsc75xx.*
 
 USB SMSC95XX ETHERNET DRIVER
 M:     Steve Glendinning <[email protected]>
-M:     Microchip Linux Driver Support <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/usb/smsc95xx.*
@@ -19014,7 +19031,7 @@ F:      drivers/input/mouse/vmmouse.h
 
 VMWARE VMXNET3 ETHERNET DRIVER
 M:     Ronak Doshi <[email protected]>
-M:     "VMware, Inc." <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/vmxnet3/