I will soon lose access to my @arm.com email address, so let's
update the MAINTAINERS file to point to my @kernel.org address,
as well as .mailmap for good measure.

Note that my @arm.com address will still work, but someone else
will be reading whatever is sent there. Don't say you didn't know!

Signed-off-by: Marc Zyngier <[email protected]>
---

Notes:
    Yes, I'm sending this from my ARM address. That's intentional.
    I'll probably send it as part of a pull request later in the
    cycle, but that's just so that people know what is coming.

 .mailmap    | 1 +
 MAINTAINERS | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0fef932de3db..23cfed2e015c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -132,6 +132,7 @@ Linus Lüssing <[email protected]> 
<[email protected]>
 Li Yang <[email protected]> <[email protected]>
 Li Yang <[email protected]> <[email protected]>
 Maciej W. Rozycki <[email protected]> <[email protected]>
+Marc Zyngier <[email protected]> <[email protected]>
 Marcin Nowakowski <[email protected]> <[email protected]>
 Mark Brown <[email protected]>
 Mark Yao <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 677ef41cb012..eff3dca4869d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1161,7 +1161,7 @@ F:        include/uapi/linux/if_arcnet.h
 
 ARM ARCHITECTED TIMER DRIVER
 M:     Mark Rutland <[email protected]>
-M:     Marc Zyngier <[email protected]>
+M:     Marc Zyngier <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/include/asm/arch_timer.h
@@ -8303,7 +8303,7 @@ S:        Obsolete
 F:     include/uapi/linux/ipx.h
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
-M:     Marc Zyngier <[email protected]>
+M:     Marc Zyngier <[email protected]>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:     Documentation/IRQ-domain.txt
@@ -8321,7 +8321,7 @@ F:        kernel/irq/
 IRQCHIP DRIVERS
 M:     Thomas Gleixner <[email protected]>
 M:     Jason Cooper <[email protected]>
-M:     Marc Zyngier <[email protected]>
+M:     Marc Zyngier <[email protected]>
 L:     [email protected]
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@ -8633,7 +8633,7 @@ F:        arch/x86/include/asm/svm.h
 F:     arch/x86/kvm/svm.c
 
 KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
-M:     Marc Zyngier <[email protected]>
+M:     Marc Zyngier <[email protected]>
 R:     James Morse <[email protected]>
 R:     Julien Thierry <[email protected]>
 R:     Suzuki K Pouloze <[email protected]>
-- 
2.20.1

Reply via email to