From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 24 Feb 2022 13:49:56 +0000 (-0500)
Subject: Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18
X-Git-Tag: v5.18-rc1~139^2~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'kvm-ppc-cap-210' into kvm-next-5.18
---

4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284
diff --cc include/uapi/linux/kvm.h
index dbc550bbd9fa3,507ee1f2aa96b..a02bbf8fd0f67
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -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