MAINTAINERS: update Michal Simek's email

@xilinx.com is still working but better to switch to new amd.com after
AMD/Xilinx acquisition.

Link: https://lkml.kernel.org/r/bd073d026f8c367a9cfb45d26d39f26e40c665dc.1683035692.git.michal.simek@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Kirill Tkhai <tkhai@ya.ru>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
Cc: Qais Yousef <qyousef@layalina.io>
Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/.mailmap b/.mailmap
index adfed592f88bcfdc9fdbddc28a6267543b7a5b4e..d3eb862f71abffa9eb37c793d42d1ae7f01087f4 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -328,6 +328,7 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
 Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
 Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <m@bues.ch>
+Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
 Michel Dänzer <michel@tungstengraphics.com>
 Michel Lespinasse <michel@lespinasse.org>
 Michel Lespinasse <michel@lespinasse.org> <walken@google.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 32772c383ab71a5595b38ca6428fe1ae32b98e09..51f7682246be34aa6ace0760b814a51e2e73dd5a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3036,7 +3036,7 @@ F:        drivers/video/fbdev/wm8505fb*
 F:     drivers/video/fbdev/wmt_ge_rops.*
 
 ARM/ZYNQ ARCHITECTURE
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 W:     http://wiki.xilinx.com
@@ -23084,7 +23084,7 @@ F:      drivers/net/can/xilinx_can.c
 XILINX GPIO DRIVER
 M:     Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
 R:     Srinivas Neeli <srinivas.neeli@xilinx.com>
-R:     Michal Simek <michal.simek@xilinx.com>
+R:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
 F:     Documentation/devicetree/bindings/gpio/gpio-zynq.yaml