Merge tag 'kvm-ppc-next-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulu...

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.

diff --cc MAINTAINERS
index 166e765acce87dd67c0df368452ca2b1e97dbe41,6426db5198f0537746c22d10f95ce4a5004fdde3..1dd30ccf51367d5267dc4a44ab9a480afa23ce57
--- 1/MAINTAINERS
--- 2/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 <[email protected]>
 -L:    [email protected]
 -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 <ma[email protected]>
+ M:    Marc Zyngier <ma[email protected]>
  R:    James Morse <[email protected]>
- R:    Julien Thierry <julien.thierry@arm.com>
- R:    Suzuki K Pouloze <[email protected]>
+ R:    Julien Thierry <julien.thierry.kdev@gmail.com>
+ R:    Suzuki K Poulose <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

diff --cc arch/arm64/kernel/traps.c
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge