MAINTAINERS: Update email address for Christophe Leroy

My address at csgroup.eu is redirected to the new one at
cs-soprasteria.com which is a Professionnal Microsoft account without
SMTP gateway. We still have the SMTP gateway for csgroup.eu but it is
not maintained anymore and might stop working at anytime. In addition
the DKIM signature is not performed allthough the domain has DMARC
set up.

Switch to kernel.org email address and add entries in mailmap.

Link: https://lore.kernel.org/r/d9b6758297d7dcddf79feb4459ceaedd7d6f1f2e.1764155757.git.chleroy@kernel.org
Signed-off-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>

diff --git a/.mailmap b/.mailmap
index d2edd256b19d6d68e2f4268b098b1845b9bddf08..55408cd5e082409c27f31e44bc4ee4bdcd14dac6 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -184,6 +184,9 @@ Christian Brauner <brauner@kernel.org> <christian@brauner.io>
 Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
 Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
 Christian Marangi <ansuelsmth@gmail.com>
+Christophe Leroy <chleroy@kernel.org> <christophe.leroy@c-s.fr>
+Christophe Leroy <chleroy@kernel.org> <christophe.leroy@csgroup.eu>
+Christophe Leroy <chleroy@kernel.org> <christophe.leroy2@cs-soprasteria.com>
 Christophe Ricard <christophe.ricard@gmail.com>
 Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
 Christoph Hellwig <hch@lst.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 46126ce2f968e4f9260263f1574ee29f5ff0de1c..c338baa3af99bfeb8d85a663265eb8a10801a4af 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4532,7 +4532,7 @@ F:        drivers/net/ethernet/netronome/nfp/bpf/
 
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:     Hari Bathini <hbathini@linux.ibm.com>
-M:     Christophe Leroy <christophe.leroy@csgroup.eu>
+M:     Christophe Leroy (CS GROUP) <chleroy@kernel.org>
 R:     Naveen N Rao <naveen@kernel.org>
 L:     bpf@vger.kernel.org
 S:     Supported
@@ -10003,7 +10003,7 @@ F:      drivers/spi/spi-fsl-qspi.c
 
 FREESCALE QUICC ENGINE LIBRARY
 M:     Qiang Zhao <qiang.zhao@nxp.com>
-M:     Christophe Leroy <christophe.leroy@csgroup.eu>
+M:     Christophe Leroy (CS GROUP) <chleroy@kernel.org>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/soc/fsl/qe/
@@ -10056,7 +10056,7 @@ S:      Maintained
 F:     drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC DRIVERS
-M:     Christophe Leroy <christophe.leroy@csgroup.eu>
+M:     Christophe Leroy (CS GROUP) <chleroy@kernel.org>
 L:     linuxppc-dev@lists.ozlabs.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -14296,7 +14296,7 @@ LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Madhavan Srinivasan <maddy@linux.ibm.com>
 M:     Michael Ellerman <mpe@ellerman.id.au>
 R:     Nicholas Piggin <npiggin@gmail.com>
-R:     Christophe Leroy <christophe.leroy@csgroup.eu>
+R:     Christophe Leroy (CS GROUP) <chleroy@kernel.org>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Supported
 W:     https://github.com/linuxppc/wiki/wiki
@@ -14352,7 +14352,7 @@ F:      Documentation/devicetree/bindings/powerpc/fsl/
 F:     arch/powerpc/platforms/85xx/
 
 LINUX FOR POWERPC EMBEDDED PPC8XX AND PPC83XX
-M:     Christophe Leroy <christophe.leroy@csgroup.eu>
+M:     Christophe Leroy (CS GROUP) <chleroy@kernel.org>
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/8xx/