1 files changed, 11 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f835946d78ce..e17ebf70b548 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3204,6 +3204,7 @@ F:	drivers/phy/broadcom/phy-brcm-usb*
 BROADCOM GENET ETHERNET DRIVER
 M:      Doug Berger <opendmb@gmail.com>
 M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      bcm-kernel-feedback-list@broadcom.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/genet/
@@ -3311,6 +3312,7 @@ F:	drivers/spi/spi-iproc-qspi.c
 
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:      Florian Fainelli <f.fainelli@gmail.com>
+L:      bcm-kernel-feedback-list@broadcom.com
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/broadcom/bcmsysport.*
@@ -5276,7 +5278,7 @@ DRM DRIVERS FOR VIVANTE GPU IP
 M:      Lucas Stach <l.stach@pengutronix.de>
 R:      Russell King <linux+etnaviv@armlinux.org.uk>
 R:      Christian Gmeiner <christian.gmeiner@gmail.com>
-L:      etnaviv@lists.freedesktop.org
+L:      etnaviv@lists.freedesktop.org (moderated for non-subscribers)
 L:      dri-devel@lists.freedesktop.org
 S:      Maintained
 F:      drivers/gpu/drm/etnaviv/
@@ -8459,6 +8461,7 @@ F:	include/linux/kvm*
 F:      include/kvm/iodev.h
 F:      virt/kvm/*
 F:      tools/kvm/
+F:      tools/testing/selftests/kvm/
 
 KERNEL VIRTUAL MACHINE FOR AMD-V (KVM/amd)
 M:      Joerg Roedel <joro@8bytes.org>
@@ -8468,29 +8471,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@arm.com>
 M:      Marc Zyngier <marc.zyngier@arm.com>
+R:      James Morse <james.morse@arm.com>
+R:      Julien Thierry <julien.thierry@arm.com>
+R:      Suzuki K Pouloze <suzuki.poulose@arm.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:      kvmarm@lists.cs.columbia.edu
 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@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
-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@kernel.org>