]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 24 Feb 2022 13:49:56 +0000 (08:49 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 24 Feb 2022 13:49:56 +0000 (08:49 -0500)
1  2 
Documentation/virt/kvm/api.rst
include/uapi/linux/kvm.h

Simple merge
index dbc550bbd9fa30c86d20dd43f1f0fb7ddd3ec94c,507ee1f2aa96b12121fabb824f3c62ab3056a65b..a02bbf8fd0f67ceaf61b9e8f445272b6a3cde24b
@@@ -1140,7 -1134,7 +1140,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_VM_GPA_BITS 207
  #define KVM_CAP_XSAVE2 208
  #define KVM_CAP_SYS_ATTRIBUTES 209
- #define KVM_CAP_S390_MEM_OP_EXTENSION 210
+ #define KVM_CAP_PPC_AIL_MODE_3 210
++#define KVM_CAP_S390_MEM_OP_EXTENSION 211
  
  #ifdef KVM_CAP_IRQ_ROUTING