[PATCH] MAINTAINERS: Update email of Neil Armstrong

From: Neil Armstrong
Date: Tue Aug 16 2022 - 06:39:31 EST

From: Neil Armstrong <neil.armstrong@xxxxxxxxxx>

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

This updates the MAINTAINERS file, the YAML bindings and adds an
entry in the .mailmap file.

Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
---
.mailmap | 1 +
.../amlogic/amlogic,meson-gx-ao-secure.yaml | 2 +-
.../display/amlogic,meson-dw-hdmi.yaml | 2 +-
.../bindings/display/amlogic,meson-vpu.yaml | 2 +-
.../display/bridge/analogix,anx7814.yaml | 2 +-
.../bindings/display/bridge/ite,it66121.yaml | 2 +-
.../display/panel/sgd,gktw70sdae4se.yaml | 2 +-
.../bindings/i2c/amlogic,meson6-i2c.yaml | 2 +-
.../mailbox/amlogic,meson-gxbb-mhu.yaml | 2 +-
.../bindings/media/amlogic,axg-ge2d.yaml | 2 +-
.../bindings/media/amlogic,gx-vdec.yaml | 2 +-
.../media/amlogic,meson-gx-ao-cec.yaml | 2 +-
.../devicetree/bindings/mfd/khadas,mcu.yaml | 2 +-
.../bindings/net/amlogic,meson-dwmac.yaml | 2 +-
.../bindings/phy/amlogic,axg-mipi-dphy.yaml | 2 +-
.../phy/amlogic,meson-g12a-usb2-phy.yaml | 2 +-
.../phy/amlogic,meson-g12a-usb3-pcie-phy.yaml | 2 +-
.../bindings/power/amlogic,meson-ee-pwrc.yaml | 2 +-
.../bindings/reset/amlogic,meson-reset.yaml | 2 +-
.../bindings/rng/amlogic,meson-rng.yaml | 2 +-
.../bindings/serial/amlogic,meson-uart.yaml | 2 +-
.../bindings/soc/amlogic/amlogic,canvas.yaml | 2 +-
.../bindings/spi/amlogic,meson-gx-spicc.yaml | 2 +-
.../bindings/spi/amlogic,meson6-spifc.yaml | 2 +-
.../usb/amlogic,meson-g12a-usb-ctrl.yaml | 2 +-
.../watchdog/amlogic,meson-gxbb-wdt.yaml | 2 +-
MAINTAINERS | 20 +++++++++----------
27 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/.mailmap b/.mailmap
index 2ed1cf869175..04fb67be9b0b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -303,6 +303,7 @@ Morten Welinder <welinder@xxxxxxxxx>
Mythri P K <mythripk@xxxxxx>
Nadia Yvette Chambers <nyc@xxxxxxxxxxxxxx> William Lee Irwin III <wli@xxxxxxxxxxxxxx>
Nathan Chancellor <nathan@xxxxxxxxxx> <natechancellor@xxxxxxxxx>
+Neil Armstrong <neil.armstrong@xxxxxxxxxx> <narmstrong@xxxxxxxxxxxx>
Nguyen Anh Quynh <aquynh@xxxxxxxxx>
Nicholas Piggin <npiggin@xxxxxxxxx> <npiggen@xxxxxxx>
Nicholas Piggin <npiggin@xxxxxxxxx> <npiggin@xxxxxxxxx>
diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
index 6cc74523ebfd..1748f1605cc7 100644
--- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson Firmware registers Interface

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The Meson SoCs have a register bank with status and data shared with the
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
index 2e208d2fc98f..7cdffdb131ac 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic specific extensions to the Synopsys Designware HDMI Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

allOf:
- $ref: /schemas/sound/name-prefix.yaml#
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
index 047fd69e0377..6655a93b1874 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson Display Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The Amlogic Meson Display controller is composed of several components
diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
index bce96b5b0db0..4a5e5d9d6f90 100644
--- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter)

maintainers:
- Andrzej Hajda <andrzej.hajda@xxxxxxxxx>
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Robert Foss <robert.foss@xxxxxxxxxx>

properties:
diff --git a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
index c6e81f532215..1b2185be92cd 100644
--- a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@ -8,7 +8,7 @@ title: ITE it66121 HDMI bridge Device Tree Bindings

maintainers:
- Phong LE <ple@xxxxxxxxxxxx>
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The IT66121 is a high-performance and low-power single channel HDMI
diff --git a/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml b/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
index 44e02decdf3a..2e75e3738ff0 100644
--- a/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
+++ b/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Solomon Goldentek Display GKTW70SDAE4SE 7" WVGA LVDS Display Panel

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Thierry Reding <thierry.reding@xxxxxxxxx>

allOf:
diff --git a/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml b/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
index 6ecb0270d88d..199a354ccb97 100644
--- a/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson I2C Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Beniamino Galvani <b.galvani@xxxxxxxxx>

allOf:
diff --git a/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml b/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
index ea06976fbbc7..dfd26b998189 100644
--- a/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
+++ b/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson Message-Handling-Unit Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The Amlogic's Meson SoCs Message-Handling-Unit (MHU) is a mailbox controller
diff --git a/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml b/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
index bee93bd84771..e551be5e680e 100644
--- a/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic GE2D Acceleration Unit

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

properties:
compatible:
diff --git a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
index 5044c4bb94e0..b827edabcafa 100644
--- a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Video Decoder

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Maxime Jourdan <mjourdan@xxxxxxxxxxxx>

description: |
diff --git a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml b/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
index d93aea6a0258..8d844f4312d1 100644
--- a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson AO-CEC Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is
diff --git a/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml b/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
index a3b976f101e8..5750cc06e923 100644
--- a/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
+++ b/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Khadas on-board Microcontroller Device Tree Bindings

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
Khadas embeds a microcontroller on their VIM and Edge boards adding some
diff --git a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
index 608e1d62bed5..ddd5a073c3a8 100644
--- a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson DWMAC Ethernet controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>

# We need a select here so we don't match all nodes with 'snps,dwmac'
diff --git a/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml b/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
index be485f500887..5eddaed3d853 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic AXG MIPI D-PHY

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

properties:
compatible:
diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
index 399ebde45409..f3a5fbabbbb5 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic G12A USB2 PHY

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

properties:
compatible:
diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
index 453c083cf44c..868b4e6fde71 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic G12A USB3 + PCIE Combo PHY

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

properties:
compatible:
diff --git a/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml b/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
index f005abac7079..683c191c4921 100644
--- a/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
+++ b/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson Everything-Else Power Domains

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |+
The Everything-Else Power Domains node should be the child of a syscon
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index 494a454928ce..98db2aa74dc8 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson SoC Reset Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

properties:
compatible:
diff --git a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
index 444be32a8a29..09c6c906b1f9 100644
--- a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
+++ b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson Random number generator

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

properties:
compatible:
diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
index 72e8868db3e0..7822705ad16c 100644
--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson SoC UART Serial Interface

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The Amlogic Meson SoC UART Serial Interface is present on a large range
diff --git a/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml b/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
index 17db87cb9dab..c3c599096353 100644
--- a/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
+++ b/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Canvas Video Lookup Table

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>
- Maxime Jourdan <mjourdan@xxxxxxxxxxxx>

description: |
diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
index 50de0da42c13..0c10f7678178 100644
--- a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
+++ b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson SPI Communication Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

allOf:
- $ref: "spi-controller.yaml#"
diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
index 8a9d526d06eb..ac3b2ec300ac 100644
--- a/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
+++ b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson SPI Flash Controller

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

allOf:
- $ref: "spi-controller.yaml#"
diff --git a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
index e349fa5de606..daf2a859418d 100644
--- a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
+++ b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Amlogic Meson G12A DWC3 USB SoC Controller Glue

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

description: |
The Amlogic G12A embeds a DWC3 USB IP Core configured for USB2 and USB3
diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
index c7459cf70e30..497d60408ea0 100644
--- a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#";
title: Meson GXBB SoCs Watchdog timer

maintainers:
- - Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+ - Neil Armstrong <neil.armstrong@xxxxxxxxxx>

allOf:
- $ref: watchdog.yaml#
diff --git a/MAINTAINERS b/MAINTAINERS
index 66bffb24a348..dd319665232f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1769,7 +1769,7 @@ N: sun[x456789]i
N: sun50i

ARM/Amlogic Meson SoC CLOCK FRAMEWORK
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
M: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Maintained
@@ -1794,7 +1794,7 @@ F: Documentation/devicetree/bindings/sound/amlogic*
F: sound/soc/meson/

ARM/Amlogic Meson SoC support
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
M: Kevin Hilman <khilman@xxxxxxxxxxxx>
R: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
R: Martin Blumenstingl <martin.blumenstingl@xxxxxxxxxxxxxx>
@@ -2489,7 +2489,7 @@ W: http://www.digriz.org.uk/ts78xx/kernel
F: arch/arm/mach-orion5x/ts78xx-*

ARM/OXNAS platform support
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
L: linux-oxnas@xxxxxxxxx (moderated for non-subscribers)
S: Maintained
@@ -6618,7 +6618,7 @@ F: Documentation/devicetree/bindings/display/allwinner*
F: drivers/gpu/drm/sun4i/

DRM DRIVERS FOR AMLOGIC SOCS
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Supported
@@ -6640,7 +6640,7 @@ F: drivers/gpu/drm/atmel-hlcdc/

DRM DRIVERS FOR BRIDGE CHIPS
M: Andrzej Hajda <andrzej.hajda@xxxxxxxxx>
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
M: Robert Foss <robert.foss@xxxxxxxxxx>
R: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx>
R: Jonas Karlman <jonas@xxxxxxxxx>
@@ -10575,7 +10575,7 @@ F: drivers/media/tuners/it913x*

ITE IT66121 HDMI BRIDGE DRIVER
M: Phong LE <ple@xxxxxxxxxxxx>
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@ -11081,7 +11081,7 @@ F: kernel/debug/
F: kernel/module/kdb.c

KHADAS MCU MFD DRIVER
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Maintained
F: Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
@@ -12951,7 +12951,7 @@ S: Maintained
F: drivers/watchdog/menz69_wdt.c

MESON AO CEC DRIVER FOR AMLOGIC SOCS
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
L: linux-media@xxxxxxxxxxxxxxx
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Supported
@@ -12962,7 +12962,7 @@ F: drivers/media/cec/platform/meson/ao-cec-g12a.c
F: drivers/media/cec/platform/meson/ao-cec.c

MESON GE2D DRIVER FOR AMLOGIC SOCS
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
L: linux-media@xxxxxxxxxxxxxxx
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Supported
@@ -12978,7 +12978,7 @@ F: Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
F: drivers/mtd/nand/raw/meson_*

MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
-M: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
+M: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
L: linux-media@xxxxxxxxxxxxxxx
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Supported
--
2.25.1