Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

diff --cc arch/powerpc/include/asm/kvm_book3s.h
Simple merge

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

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

diff --cc arch/powerpc/kvm/trace.h
Simple merge