summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-01-22 09:51:45 -0600
committerTom Rini <trini@konsulko.com>2025-01-22 11:21:58 -0600
commit154c0ab389cb7725d07e5a653c9a25f1bbdef965 (patch)
tree7914fd80427186de2bce488b0d64a64e5098c53e
parent01b1e062bac4d9396b5cf40daf1e82f2ca87a389 (diff)
parentc803dfb22c7646466bb7ce6a3ca3012ca994931f (diff)
Merge patch series "Update my email address"
Christopher Obbard <christopher.obbard@linaro.org> says: Update my email address for various locations in the U-Boot project. This will (hopefully) stop any mails from going to /dev/null. Link: https://lore.kernel.org/r/20250115-wip-obbardc-update-email-v1-0-0b4cd69c91fd@linaro.org
-rw-r--r--.mailmap1
-rw-r--r--board/radxa/rockpi4-rk3399/MAINTAINERS2
2 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 005e965b84f..dc11775d4e7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,6 +36,7 @@ Bin Meng <bmeng.cn@gmail.com> <bin.meng@windriver.com>
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
Christian Kohn <chris.kohn@amd.com> <christian.kohn@xilinx.com>
+Christopher Obbard <christopher.obbard@linaro.org> <chris.obbard@collabora.com>
Dirk Behme <dirk.behme@googlemail.com>
Durga Challa <durga.challa@amd.com> <vnsl.durga.challa@xilinx.com>
Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>
diff --git a/board/radxa/rockpi4-rk3399/MAINTAINERS b/board/radxa/rockpi4-rk3399/MAINTAINERS
index da5273fb9a3..f50d9289ed6 100644
--- a/board/radxa/rockpi4-rk3399/MAINTAINERS
+++ b/board/radxa/rockpi4-rk3399/MAINTAINERS
@@ -15,7 +15,7 @@ F: configs/rock-4c-plus-rk3399_defconfig
F: arch/arm/dts/rk3399-rock-4c-plus*
ROCK-4SE
-M: Christopher Obbard <chris.obbard@collabora.com>
+M: Christopher Obbard <christopher.obbard@linaro.org>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: configs/rock-4se-rk3399_defconfig