Merge branch 'topic/ppc-kvm' into next

Merge our KVM topic branch.

diff --cc arch/powerpc/kernel/iommu.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc arch/powerpc/mm/init_64.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge