summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Upton <oupton@kernel.org>2025-11-06 17:28:25 -0800
committerMarc Zyngier <maz@kernel.org>2025-11-08 11:21:20 +0000
commit4af235bf645516481a82227d82d1352b9788903a (patch)
treebe3987451b80bcf2c2709936c9ca9669e9bfe633
parent66768669f27d98b45b20ed401cca913c387a9934 (diff)
MAINTAINERS: Switch myself to using kernel.org address
I've been running into issues with the linux.dev email semi-periodically, switching to my kernel.org address while I go figure out a better home for my inbox. Signed-off-by: Oliver Upton <oupton@kernel.org> Link: https://patch.msgid.link/20251107012830.1708225-1-oupton@kernel.org Signed-off-by: Marc Zyngier <maz@kernel.org>
-rw-r--r--.mailmap3
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index d2edd256b19d..54dde6226079 100644
--- a/.mailmap
+++ b/.mailmap
@@ -603,7 +603,8 @@ Oleksij Rempel <o.rempel@pengutronix.de>
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
-Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
+Oliver Upton <oupton@kernel.org> <oupton@google.com>
+Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>
Ondřej Jirman <megi@xff.cz> <megous@megous.com>
Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
diff --git a/MAINTAINERS b/MAINTAINERS
index 46126ce2f968..234b50c2c10b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13642,7 +13642,7 @@ F: virt/kvm/*
KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
M: Marc Zyngier <maz@kernel.org>
-M: Oliver Upton <oliver.upton@linux.dev>
+M: Oliver Upton <oupton@kernel.org>
R: Joey Gouly <joey.gouly@arm.com>
R: Suzuki K Poulose <suzuki.poulose@arm.com>
R: Zenghui Yu <yuzenghui@huawei.com>