From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 3 Jul 2017 08:41:59 +0000 (+0200)
Subject: Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8a53e7e572252e551fd4b172dc207f8beca1ae20;p=linux.git

Merge branch 'kvm-ppc-next' of git://git./linux/kernel/git/paulus/powerpc into HEAD

- 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.
---

8a53e7e572252e551fd4b172dc207f8beca1ae20
diff --cc include/uapi/linux/kvm.h
index 2b8dc1ca18d4a,36ea74aa34220..c0b6dfec5f872
--- a/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