aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorPaolo Bonzini2022-06-23 10:27:21 -0400
committerPaolo Bonzini2022-06-23 10:27:21 -0400
commit922d4578cfd017da67f545bfd07331bda86f795d (patch)
tree39b5033fb48280d15f686acd1c0f7eb430c79e90 /MAINTAINERS
parent9e2f6498efbbc880d7caa7935839e682b64fe5a6 (diff)
parentcbc6d44867a24130ee528c20cffcbc28b3e09693 (diff)
Merge tag 'kvmarm-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.19, take #2 - Fix a regression with pKVM when kmemleak is enabled - Add Oliver Upton as an official KVM/arm64 reviewer
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 43d3d07afccd..97014ae3e5ed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10830,6 +10830,7 @@ M: Marc Zyngier <maz@kernel.org>
R: James Morse <james.morse@arm.com>
R: Alexandru Elisei <alexandru.elisei@arm.com>
R: Suzuki K Poulose <suzuki.poulose@arm.com>
+R: Oliver Upton <oliver.upton@linux.dev>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: kvmarm@lists.cs.columbia.edu (moderated for non-subscribers)
S: Maintained