aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJisheng Zhang <Jisheng.Zhang@synaptics.com>2022-03-04 15:55:59 +0800
committerArnd Bergmann <arnd@arndb.de>2022-03-08 17:30:32 +0100
commitd986afd5a7b75b477ac347b222354cecd97edc87 (patch)
treeb2dd16ad936477447d4fca53c5747b5d7462f18f
parentd25ca90833073f2b807e0e697dcf05ba75396de7 (diff)
downloadlinux-d986afd5a7b75b477ac347b222354cecd97edc87.tar.gz
MAINTAINERS: Update Jisheng's email address
I'm leaving synaptics. Update my email address to my korg mail address and add entries to .mailmap as well to map my work addresses to korg mail address. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> Link: https://lore.kernel.org/r/ce7213bd-28ac-6580-466e-875e755fe0ae@synaptics.com' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--.mailmap2
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index b96b98a2d9de33..97ccdf14711147 100644
--- a/.mailmap
+++ b/.mailmap
@@ -187,6 +187,8 @@ Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>
Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
+Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com>
+Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
diff --git a/MAINTAINERS b/MAINTAINERS
index 6ec18c4bd242f0..d53eb153157a4f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2739,7 +2739,7 @@ N: stm32
N: stm
ARM/Synaptics SoC support
-M: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
+M: Jisheng Zhang <jszhang@kernel.org>
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained