Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

- Better machine check handling for HV KVM
- Ability to support guests with threads=2, 4 or 8 on POWER9
- Fix for a race that could cause delayed recognition of signals
- Fix for a bug where POWER9 guests could sleep with interrupts
  pending.

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

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

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

diff --cc include/uapi/linux/kvm.h
index 2b8dc1c,36ea74a..c0b6dfe
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -924,7 -895,8 +924,9 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_SPAPR_TCE_VFIO 142
  #define KVM_CAP_X86_GUEST_MWAIT 143
  #define KVM_CAP_ARM_USER_IRQ 144
 -#define KVM_CAP_PPC_FWNMI 145
 -#define KVM_CAP_PPC_SMT_POSSIBLE 146
 +#define KVM_CAP_S390_CMMA_MIGRATION 145
++#define KVM_CAP_PPC_FWNMI 146
++#define KVM_CAP_PPC_SMT_POSSIBLE 147
  
  #ifdef KVM_CAP_IRQ_ROUTING