[PATCH v2] MAINTAINERS: Update email address for Christophe Leroy

[Christophe Leroy (CS GROUP)]

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.

Signed-off-by: Christophe Leroy (CS GROUP) <chleroy at kernel.org>
---
I will take this patch through the SOC FSL tree.

v2: Added affiliation to the display name
---
 .mailmap    |  3 +++
 MAINTAINERS | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.mailmap b/.mailmap
index d2edd256b19d..55408cd5e082 100644
--- a/.mailmap
+++ b/.mailmap
@@ -184,6 +184,9 @@ Christian Brauner <brauner at kernel.org> <christian at brauner.io>
 Christian Brauner <brauner at kernel.org> <christian.brauner at canonical.com>
 Christian Brauner <brauner at kernel.org> <christian.brauner at ubuntu.com>
 Christian Marangi <ansuelsmth at gmail.com>
+Christophe Leroy <chleroy at kernel.org> <christophe.leroy at c-s.fr>
+Christophe Leroy <chleroy at kernel.org> <christophe.leroy at csgroup.eu>
+Christophe Leroy <chleroy at kernel.org> <christophe.leroy2 at cs-soprasteria.com>
 Christophe Ricard <christophe.ricard at gmail.com>
 Christopher Obbard <christopher.obbard at linaro.org> <chris.obbard at collabora.com>
 Christoph Hellwig <hch at lst.de>
diff --git a/MAINTAINERS b/MAINTAINERS
index 46126ce2f968..c338baa3af99 100644
--- 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 at linux.ibm.com>
-M:	Christophe Leroy <christophe.leroy at csgroup.eu>
+M:	Christophe Leroy (CS GROUP) <chleroy at kernel.org>
 R:	Naveen N Rao <naveen at kernel.org>
 L:	bpf at 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 at nxp.com>
-M:	Christophe Leroy <christophe.leroy at csgroup.eu>
+M:	Christophe Leroy (CS GROUP) <chleroy at kernel.org>
 L:	linuxppc-dev at 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 at csgroup.eu>
+M:	Christophe Leroy (CS GROUP) <chleroy at kernel.org>
 L:	linuxppc-dev at lists.ozlabs.org
 L:	linux-arm-kernel at 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 at linux.ibm.com>
 M:	Michael Ellerman <mpe at ellerman.id.au>
 R:	Nicholas Piggin <npiggin at gmail.com>
-R:	Christophe Leroy <christophe.leroy at csgroup.eu>
+R:	Christophe Leroy (CS GROUP) <chleroy at kernel.org>
 L:	linuxppc-dev at 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 at csgroup.eu>
+M:	Christophe Leroy (CS GROUP) <chleroy at kernel.org>
 L:	linuxppc-dev at lists.ozlabs.org
 S:	Maintained
 F:	arch/powerpc/platforms/8xx/
-- 
2.49.0