Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
authorPaul Mackerras <paulus@ozlabs.org>
Thu, 31 Aug 2017 02:37:03 +0000 (12:37 +1000)
committerPaul Mackerras <paulus@ozlabs.org>
Thu, 31 Aug 2017 02:37:03 +0000 (12:37 +1000)
commit4dafecde443a3f5690d68a3a0d32202b634b2675
tree6faa5efe3fa7f9a24514111777515e7a4c8bd8c1
parente3bfed1df379c18f20feb06427d952b766e2c00f
parent94a04bc25a2c6296bd0c5e82c10e8231c2b11f77
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in the 'ppc-kvm' topic branch from the powerpc tree in
order to bring in some fixes which touch both powerpc and KVM code.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
arch/powerpc/kernel/idle_book3s.S
arch/powerpc/kvm/book3s_64_mmu_hv.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_rm_mmu.c
arch/powerpc/kvm/book3s_hv_rmhandlers.S