[PATCH] MAINTAINERS: Update my email address to @kernel.org

[Marc Zyngier]

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 <marc.zyngier@xxxxxxx>
---

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 <linus.luessing@xxxxxxxxx> <linus.luessing@xxxxxxxx>
 Li Yang <leoyang.li@xxxxxxx> <leo@xxxxxxxxxxxxx>
 Li Yang <leoyang.li@xxxxxxx> <leoli@xxxxxxxxxxxxx>
 Maciej W. Rozycki <macro@xxxxxxxx> <macro@xxxxxxxxxx>
+Marc Zyngier <maz@xxxxxxxxxx> <marc.zyngier@xxxxxxx>
 Marcin Nowakowski <marcin.nowakowski@xxxxxxxx> <marcin.nowakowski@xxxxxxxxxx>
 Mark Brown <broonie@xxxxxxxxxxxxx>
 Mark Yao <markyao0591@xxxxxxxxx> <mark.yao@xxxxxxxxxxxxxx>
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 <mark.rutland@xxxxxxx>
-M:	Marc Zyngier <marc.zyngier@xxxxxxx>
+M:	Marc Zyngier <maz@xxxxxxxxxx>
 L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (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 <marc.zyngier@xxxxxxx>
+M:	Marc Zyngier <maz@xxxxxxxxxx>
 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 <tglx@xxxxxxxxxxxxx>
 M:	Jason Cooper <jason@xxxxxxxxxxxxxx>
-M:	Marc Zyngier <marc.zyngier@xxxxxxx>
+M:	Marc Zyngier <maz@xxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 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 <marc.zyngier@xxxxxxx>
+M:	Marc Zyngier <maz@xxxxxxxxxx>
 R:	James Morse <james.morse@xxxxxxx>
 R:	Julien Thierry <julien.thierry@xxxxxxx>
 R:	Suzuki K Pouloze <suzuki.poulose@xxxxxxx>
-- 
2.20.1