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

Conflicts:
	arch/powerpc/include/asm/kvm_ppc.h
	arch/powerpc/kvm/e500_tlb.c
	include/linux/kvm.h

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc include/linux/kvm.h
index d808694673f9fd65fe11923f341ed3d83daf58f7,f4f5be8dd58e1f6f9fc524ed64c2e757f5ea3598..41a9fd5c61d8a0f116967aa76e4d9ff4165d1785
--- 1/include/linux/kvm.h
--- 2/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -622,9 -621,7 +625,10 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_PPC_GET_SMMU_INFO 78
  #define KVM_CAP_S390_COW 79
  #define KVM_CAP_PPC_ALLOC_HTAB 80
 -#define KVM_CAP_PPC_BOOKE_WATCHDOG 81
 +#ifdef __KVM_HAVE_READONLY_MEM
 +#define KVM_CAP_READONLY_MEM 81
 +#endif
++#define KVM_CAP_PPC_BOOKE_WATCHDOG 82
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

diff --cc include/linux/kvm_host.h
Simple merge