For historical reasons, KVM/arm and KVM/arm64 have had different entries in the MAINTAINER file. This makes little sense, as they are maintained together. On top of that, we have a bunch of talented people helping with the reviewing, and they deserve to be mentioned in the consolidated entry. Acked-by: Christoffer Dall <christoffer.dall@xxxxxxx> Acked-by: Suzuki K Poulose <suzuki.poulose@xxxxxxx> Acked-by: James Morse <james.morse@xxxxxxx> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> --- MAINTAINERS | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 51029a425dbe..5d68f050d155 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8297,29 +8297,25 @@ S: Maintained F: arch/x86/include/asm/svm.h F: arch/x86/kvm/svm.c -KERNEL VIRTUAL MACHINE FOR ARM (KVM/arm) +KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64) M: Christoffer Dall <christoffer.dall@xxxxxxx> M: Marc Zyngier <marc.zyngier@xxxxxxx> +R: James Morse <james.morse@xxxxxxx> +R: Julien Thierry <julien.thierry@xxxxxxx> +R: Suzuki K Pouloze <suzuki.poulose@xxxxxxx> L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) L: kvmarm@xxxxxxxxxxxxxxxxxxxxx W: http://systems.cs.columbia.edu/projects/kvm-arm T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git -S: Supported +S: Maintained F: arch/arm/include/uapi/asm/kvm* F: arch/arm/include/asm/kvm* F: arch/arm/kvm/ -F: virt/kvm/arm/ -F: include/kvm/arm_* - -KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) -M: Christoffer Dall <christoffer.dall@xxxxxxx> -M: Marc Zyngier <marc.zyngier@xxxxxxx> -L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers) -L: kvmarm@xxxxxxxxxxxxxxxxxxxxx -S: Maintained F: arch/arm64/include/uapi/asm/kvm* F: arch/arm64/include/asm/kvm* F: arch/arm64/kvm/ +F: virt/kvm/arm/ +F: include/kvm/arm_* KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips) M: James Hogan <jhogan@xxxxxxxxxx> -- 2.20.1
