Merge tag 'usb-for-v5.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a224ee..464d3b3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -364,7 +364,7 @@ F:  drivers/acpi/fan.c
 
 ACPI FOR ARM64 (ACPI/arm64)
 M:     Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-M:     Hanjun Guo <hanjun.guo@linaro.org>
+M:     Hanjun Guo <guohanjun@huawei.com>
 M:     Sudeep Holla <sudeep.holla@arm.com>
 L:     linux-acpi@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1235,7 +1235,7 @@ F:        arch/arm/lib/floppydma.S
 F:     arch/arm/include/asm/floppy.h
 
 ARM PMU PROFILING AND DEBUGGING
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 M:     Mark Rutland <mark.rutland@arm.com>
 S:     Maintained
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1307,7 +1307,7 @@ F:        Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
 F:     drivers/irqchip/irq-vic.c
 
 ARM SMMU DRIVERS
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 R:     Robin Murphy <robin.murphy@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -2550,7 +2550,7 @@ F:        drivers/i2c/busses/i2c-xiic.c
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
 S:     Maintained
@@ -2734,7 +2734,7 @@ S:        Maintained
 F:     drivers/net/wireless/atmel/atmel*
 
 ATOMIC INFRASTRUCTURE
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 M:     Peter Zijlstra <peterz@infradead.org>
 R:     Boqun Feng <boqun.feng@gmail.com>
 L:     linux-kernel@vger.kernel.org
@@ -3751,7 +3751,7 @@ F:        scripts/extract-cert.c
 CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
 L:     linux-usb@vger.kernel.org
 S:     Orphan
-F:     Documentation/usb/WUSB-Design-overview.txt
+F:     Documentation/usb/wusb-design-overview.rst
 F:     Documentation/usb/wusb-cbaf
 F:     drivers/usb/host/hwa-hc.c
 F:     drivers/usb/host/whci/
@@ -6234,7 +6234,6 @@ F:        include/linux/ipmi-fru.h
 K:     fmc_d.*register
 
 FPGA MANAGER FRAMEWORK
-M:     Alan Tull <atull@kernel.org>
 M:     Moritz Fischer <mdf@kernel.org>
 L:     linux-fpga@vger.kernel.org
 S:     Maintained
@@ -9121,7 +9120,7 @@ F:        drivers/misc/lkdtm/*
 LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
 M:     Alan Stern <stern@rowland.harvard.edu>
 M:     Andrea Parri <andrea.parri@amarulasolutions.com>
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Boqun Feng <boqun.feng@gmail.com>
 M:     Nicholas Piggin <npiggin@gmail.com>
@@ -9229,7 +9228,7 @@ F:        Documentation/admin-guide/LSM/LoadPin.rst
 LOCKING PRIMITIVES
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Ingo Molnar <mingo@redhat.com>
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
 S:     Maintained
@@ -10550,7 +10549,7 @@ F:      arch/arm/boot/dts/mmp*
 F:     arch/arm/mach-mmp/
 
 MMU GATHER AND TLB INVALIDATION
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 M:     "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>
 M:     Andrew Morton <akpm@linux-foundation.org>
 M:     Nick Piggin <npiggin@gmail.com>
@@ -12039,7 +12038,7 @@ S:      Maintained
 F:     drivers/pci/controller/dwc/*layerscape*
 
 PCI DRIVER FOR GENERIC OF HOSTS
-M:     Will Deacon <will.deacon@arm.com>
+M:     Will Deacon <will@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -14404,7 +14403,7 @@ F:      lib/test_siphash.c
 F:     include/linux/siphash.h
 
 SIOX
-M:     Gavin Schenk <g.schenk@eckelmann.de>
+M:     Thorsten Scherer <t.scherer@eckelmann.de>
 M:     Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 S:     Supported
@@ -16247,7 +16246,7 @@ USB ACM DRIVER
 M:     Oliver Neukum <oneukum@suse.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/acm.txt
+F:     Documentation/usb/acm.rst
 F:     drivers/usb/class/cdc-acm.*
 
 USB AR5523 WIRELESS DRIVER
@@ -16300,7 +16299,7 @@ USB EHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/ehci.txt
+F:     Documentation/usb/ehci.rst
 F:     drivers/usb/host/ehci*
 
 USB GADGET/PERIPHERAL SUBSYSTEM
@@ -16374,7 +16373,7 @@ USB OHCI DRIVER
 M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/ohci.txt
+F:     Documentation/usb/ohci.rst
 F:     drivers/usb/host/ohci*
 
 USB OTG FSM (Finite State Machine)
@@ -16390,7 +16389,7 @@ M:      Shuah Khan <shuah@kernel.org>
 M:     Shuah Khan <skhan@linuxfoundation.org>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     Documentation/usb/usbip_protocol.txt
+F:     Documentation/usb/usbip_protocol.rst
 F:     drivers/usb/usbip/
 F:     tools/usb/usbip/
 F:     tools/testing/selftests/drivers/usb/usbip/
@@ -16438,7 +16437,7 @@ M:      Johan Hovold <johan@kernel.org>
 L:     linux-usb@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
 S:     Maintained
-F:     Documentation/usb/usb-serial.txt
+F:     Documentation/usb/usb-serial.rst
 F:     drivers/usb/serial/
 F:     include/linux/usb/serial.h