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>

diff --git a/.mailmap b/.mailmap
index d2edd256b19d6d68e2f4268b098b1845b9bddf08..54dde6226079ef433d9098d48dc7428b884685d6 100644 (file)
--- 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 46126ce2f968e4f9260263f1574ee29f5ff0de1c..234b50c2c10b9d9d6434a8d2bd8868e05604e2f2 100644 (file)
--- 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>