MAINTAINERS: Update email of Neil Armstrong

My professional e-mail will change and the BayLibre one will
bounce after mid-september of 2022.

This updates the MAINTAINERS files and adds an entry in the
.mailmap file.

Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/.mailmap b/.mailmap
index f27f366bcb50e24e92e6ea1a069cf21c4c92f2a4..8acce4b2bfe4c49f78a9ff697b291043f9ff431c 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -49,6 +49,7 @@ 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>
+Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
 Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
 Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
 Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5857fbf39869dcbaff5a629e54c9cae705836415..36a2b69fcb971d8d5d10c032abd1774f1ef730a6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -143,7 +143,7 @@ F:  arch/arm/mach-socfpga/
 F:     drivers/sysreset/sysreset_socfpga*
 
 ARM AMLOGIC SOC SUPPORT
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 T:     git https://source.denx.de/u-boot/custodians/u-boot-amlogic.git

diff --git a/board/amlogic/odroid-n2/MAINTAINERS b/board/amlogic/odroid-n2/MAINTAINERS
index 43724e6fdd94cb1b8c6238fda4d707820c135ef8..23cc8e73b10bfae834cdceedfa546e2d996c1281 100644 (file)
--- a/board/amlogic/odroid-n2/MAINTAINERS
+++ b/board/amlogic/odroid-n2/MAINTAINERS
@@ -1,5 +1,5 @@
 ODROID-N2
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/odroid-n2/

diff --git a/board/amlogic/p200/MAINTAINERS b/board/amlogic/p200/MAINTAINERS
index 1df9b8b24be8b5e9f52d0639c44f4f5cd88491bc..33ca3df5c6a89c8190053ff8243432fa36f93d87 100644 (file)
--- a/board/amlogic/p200/MAINTAINERS
+++ b/board/amlogic/p200/MAINTAINERS
@@ -1,6 +1,6 @@
 P200
 M:     Beniamino Galvani <b.galvani@gmail.com>
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/p200/

diff --git a/board/amlogic/p201/MAINTAINERS b/board/amlogic/p201/MAINTAINERS
index 1501b6280dab980924be96bb5e8e76e3b245e665..4549d01cad3927bbd98b4a8aa9e3c11ace0ee971 100644 (file)
--- a/board/amlogic/p201/MAINTAINERS
+++ b/board/amlogic/p201/MAINTAINERS
@@ -1,5 +1,5 @@
 P201
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/p201/

diff --git a/board/amlogic/p212/MAINTAINERS b/board/amlogic/p212/MAINTAINERS
index 3d622af29ba9bb851194a685fdea2366eebbd95f..b2e3205fdf01542682a341d8e839fe231575fa51 100644 (file)
--- a/board/amlogic/p212/MAINTAINERS
+++ b/board/amlogic/p212/MAINTAINERS
@@ -1,5 +1,5 @@
 P212
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/p212/

diff --git a/board/amlogic/q200/MAINTAINERS b/board/amlogic/q200/MAINTAINERS
index ba7c12b2c1a1a3e80e7d2f11fa7849f97d2cf874..9c84cca27e8599da308c325490aa13e4a16ce930 100644 (file)
--- a/board/amlogic/q200/MAINTAINERS
+++ b/board/amlogic/q200/MAINTAINERS
@@ -1,5 +1,5 @@
 Q200
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/q200/

diff --git a/board/amlogic/s400/MAINTAINERS b/board/amlogic/s400/MAINTAINERS
index fb46b1bbbf7d0f6099973f9252d00176b173f14d..ca51bb6b3ba14df7aa78b4f49fbd156c9cbe522e 100644 (file)
--- a/board/amlogic/s400/MAINTAINERS
+++ b/board/amlogic/s400/MAINTAINERS
@@ -1,5 +1,5 @@
 S400
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/s400/

diff --git a/board/amlogic/sei510/MAINTAINERS b/board/amlogic/sei510/MAINTAINERS
index c01c1d60df4ddb67993247713864a39ba1f44b6b..c6039bc82e2a7154e40457df657b46a1a5ec9a26 100644 (file)
--- a/board/amlogic/sei510/MAINTAINERS
+++ b/board/amlogic/sei510/MAINTAINERS
@@ -1,5 +1,5 @@
 SEI510
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/sei510/

diff --git a/board/amlogic/sei610/MAINTAINERS b/board/amlogic/sei610/MAINTAINERS
index 092178b2c835905be6dcce6c9695e1d143648087..799ad687f0942f62788000965e90c80acb0a6d40 100644 (file)
--- a/board/amlogic/sei610/MAINTAINERS
+++ b/board/amlogic/sei610/MAINTAINERS
@@ -1,5 +1,5 @@
 SEI610
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/sei610/

diff --git a/board/amlogic/u200/MAINTAINERS b/board/amlogic/u200/MAINTAINERS
index a259d12886d4623dba95976721d9f709d0c2a2f8..47cec234a1d6d6ef000ee9c7e4151b8811d1479b 100644 (file)
--- a/board/amlogic/u200/MAINTAINERS
+++ b/board/amlogic/u200/MAINTAINERS
@@ -1,5 +1,5 @@
 U200
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/u200/

diff --git a/board/amlogic/vim3/MAINTAINERS b/board/amlogic/vim3/MAINTAINERS
index d8848495c71712733be8da7939cb513a6835eb4c..c5f8d9cc5ce4a01a63f5135feb98bb87ae383cdc 100644 (file)
--- a/board/amlogic/vim3/MAINTAINERS
+++ b/board/amlogic/vim3/MAINTAINERS
@@ -1,5 +1,5 @@
 VIM3
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/vim3/

diff --git a/board/amlogic/w400/MAINTAINERS b/board/amlogic/w400/MAINTAINERS
index 991590d9f25905e4c91367c72a9c9167f59afb45..96ccda20011dc221d68af3a039bd9e212acfe37e 100644 (file)
--- a/board/amlogic/w400/MAINTAINERS
+++ b/board/amlogic/w400/MAINTAINERS
@@ -1,5 +1,5 @@
 W400
-M:     Neil Armstrong <narmstrong@baylibre.com>
+M:     Neil Armstrong <neil.armstrong@linaro.org>
 S:     Maintained
 L:     u-boot-amlogic@groups.io
 F:     board/amlogic/w400/