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

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

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

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

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

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

diff --cc arch/powerpc/kvm/book3s_64_vio_hv.c
index 039028d3ccb5ab38a39ea52dfa1bad00a6052d74,44be73e6aa26b6563d1cc4cc91e1a332a84271c3..f88b859af53b5c85d71a35e3d11b4dace211674e
--- 1/arch/powerpc/kvm/book3s_64_vio_hv.c
--- 2/arch/powerpc/kvm/book3s_64_vio_hv.c
+++ b/arch/powerpc/kvm/book3s_64_vio_hv.c
@@@ -29,7 -30,8 +30,8 @@@
  #include <asm/tlbflush.h>
  #include <asm/kvm_ppc.h>
  #include <asm/kvm_book3s.h>
 -#include <asm/mmu-hash64.h>
 +#include <asm/book3s/64/mmu-hash.h>
+ #include <asm/mmu_context.h>
  #include <asm/hvcall.h>
  #include <asm/synch.h>
  #include <asm/ppc-opcode.h>

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

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

diff --cc arch/s390/include/asm/kvm_host.h
Simple merge

diff --cc arch/s390/kvm/interrupt.c
Simple merge

diff --cc arch/x86/kvm/lapic.c
Simple merge

diff --cc arch/x86/kvm/mmu.c
Simple merge

diff --cc arch/x86/kvm/paging_tmpl.h
Simple merge

diff --cc arch/x86/kvm/vmx.c
Simple merge

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

diff --cc virt/kvm/async_pf.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge