.mailmap: Start to use new amd.com email address

Xilinx has been acquired by AMD that's why emails should be also updated.
The patch is updating .mailmap file and also MAINTAINERS files as was done
by commit 5cd1ecb99490 ("ppc: qemu: Update MAINTAINERS for correct email
address").
The rest of my emails are not going to change.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/.mailmap b/.mailmap
index 1f88ea953cec328431aa088c26ce8e5eaa02a561..3910e056f0def18e973ef602c0a90523a4156b36 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,7 @@ Marek Vasut <marex@denx.de> <marex at denx.de>
 Markus Klotzbuecher <mk@denx.de>
 Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
 Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
+Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
 Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
 Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
 Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>

diff --git a/MAINTAINERS b/MAINTAINERS
index 34446127d4ca0d5183c0267c679280cd0edb4c89..f7665fccf7a0ccac4430f29ceb0838c8b8f93d02 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -594,7 +594,7 @@ F:  configs/uniphier_*_defconfig
 N:     uniphier
 
 ARM VERSAL
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/mach-versal/
@@ -639,7 +639,7 @@ F:  tools/zynqimage.c
 N:     zynq
 
 ARM ZYNQMP
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/mach-zynqmp/
@@ -676,7 +676,7 @@ N:  ultra96
 N:     zynqmp
 
 ARM ZYNQMP R5
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/mach-zynqmp-r5/
@@ -852,7 +852,7 @@ F:  net/fastboot.c
 F:     test/dm/fastboot.c
 
 FPGA
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     drivers/fpga/

diff --git a/board/xilinx/versal/MAINTAINERS b/board/xilinx/versal/MAINTAINERS
index bbab0513666947475cf6fb44ca31f54f802ecdca..a13b65661646221df455e4deef5d98ef8e373e5b 100644 (file)
--- a/board/xilinx/versal/MAINTAINERS
+++ b/board/xilinx/versal/MAINTAINERS
@@ -1,5 +1,5 @@
 XILINX_VERSAL BOARDS
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/dts/versal*

diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS
index 56c637943f6eba44532ee4d3b755f3d3b7afae1a..17a2766413c68ebde54c1ec024128f89e8ff25b8 100644 (file)
--- a/board/xilinx/zynqmp/MAINTAINERS
+++ b/board/xilinx/zynqmp/MAINTAINERS
@@ -1,5 +1,5 @@
 XILINX_ZYNQMP BOARDS
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-microblaze.git
 F:     arch/arm/dts/zynqmp-*

diff --git a/board/xilinx/zynqmp_r5/MAINTAINERS b/board/xilinx/zynqmp_r5/MAINTAINERS
index ac267649781af33e6eba6ceb65a4f7b39955582d..aa50e6dae5f5782a4337698b1777ef705d435df1 100644 (file)
--- a/board/xilinx/zynqmp_r5/MAINTAINERS
+++ b/board/xilinx/zynqmp_r5/MAINTAINERS
@@ -1,5 +1,5 @@
 XILINX_ZYNQMP_R5 BOARDS
-M:     Michal Simek <michal.simek@xilinx.com>
+M:     Michal Simek <michal.simek@amd.com>
 S:     Maintained
 F:     arch/arm/dts/zynqmp-r5*
 F:     board/xilinx/zynqmp_r5/