summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRadim Krčmář <rkrcmar@redhat.com>2018-04-25 14:16:50 +0200
committerRadim Krčmář <rkrcmar@redhat.com>2018-04-25 14:16:50 +0200
commit06e22bb6fa5bd2d7d6cdd4d886aef90c3ef8f9c7 (patch)
tree600ef54eb192cfd401fa7b266cfe5bc8c0b0dbd7 /MAINTAINERS
parent6d08b06e67cd117f6992c46611dfb4ce267cd71e (diff)
parent85bd0ba1ff9875798fad94218b627ea9f768f3c3 (diff)
downloadlinux-06e22bb6fa5bd2d7d6cdd4d886aef90c3ef8f9c7.tar.bz2
Merge tag 'kvmarm-fixes-for-4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/arm fixes for 4.17, take #1 - PSCI selection API, a leftover from 4.16 - Kick vcpu on active interrupt affinity change - Plug a VMID allocation race on oversubscribed systems - Silence debug messages - Update Christoffer's email address
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 92be777d060a..151060871f5d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7753,7 +7753,7 @@ F: arch/x86/include/asm/svm.h
F: arch/x86/kvm/svm.c
KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm)
-M: Christoffer Dall <christoffer.dall@linaro.org>
+M: Christoffer Dall <christoffer.dall@arm.com>
M: Marc Zyngier <marc.zyngier@arm.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: kvmarm@lists.cs.columbia.edu
@@ -7767,7 +7767,7 @@ F: virt/kvm/arm/
F: include/kvm/arm_*
KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
-M: Christoffer Dall <christoffer.dall@linaro.org>
+M: Christoffer Dall <christoffer.dall@arm.com>
M: Marc Zyngier <marc.zyngier@arm.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: kvmarm@lists.cs.columbia.edu