From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 10 Sep 2019 14:51:17 +0000 (+0200)
Subject: Merge tag 'kvm-ppc-next-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulu... 
X-Git-Tag: v5.4-rc1~138^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8146856b0a2693d5f7334f720c9b39a987f7571d;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'kvm-ppc-next-5.4-1' of git://git./linux/kernel/git/paulus/powerpc into HEAD

PPC KVM update for 5.4

- Some prep for extending the uses of the rmap array
- Various minor fixes
- Commits from the powerpc topic/ppc-kvm branch, which fix a problem
  with interrupts arriving after free_irq, causing host hangs and crashes.
---

8146856b0a2693d5f7334f720c9b39a987f7571d
diff --cc MAINTAINERS
index 166e765,6426db51..1dd30cc
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -8819,11 -8819,19 +8819,11 @@@ 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>
 -L:	kvm@vger.kernel.org
 -W:	http://www.linux-kvm.org/
 -S:	Maintained
 -F:	arch/x86/include/asm/svm.h
 -F:	arch/x86/kvm/svm.c
 -
  KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
- M:	Marc Zyngier <marc.zyngier@arm.com>
+ M:	Marc Zyngier <maz@kernel.org>
  R:	James Morse <james.morse@arm.com>
- R:	Julien Thierry <julien.thierry@arm.com>
- R:	Suzuki K Pouloze <suzuki.poulose@arm.com>
+ R:	Julien Thierry <julien.thierry.kdev@gmail.com>
+ R:	Suzuki K Poulose <suzuki.poulose@arm.com>
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:	kvmarm@lists.cs.columbia.edu
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git