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

[thirdparty/kernel/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a224ee11249c2211a7b6e3726dfdbe7726127c9..46d3497af51febd374cea03ca771ce377b35a410 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
@@ -9121,7 +9121,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 +9229,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 +10550,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 +12039,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