From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 23 Jun 2021 09:43:45 +0000 (-0400)
Subject: Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/power... 
X-Git-Tag: v5.14-rc1~166^2~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ab0e28a437c213e5e2c1d890f3891b6952b9ca;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD

- Support for the H_RPT_INVALIDATE hypercall

- Conversion of Book3S entry/exit to C

- Bug fixes
---

c3ab0e28a437c213e5e2c1d890f3891b6952b9ca
diff --cc include/uapi/linux/kvm.h
index 9febe1412f7a6,613198a94c439..330835f1005b6
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1083,9 -1082,7 +1083,10 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_SGX_ATTRIBUTE 196
  #define KVM_CAP_VM_COPY_ENC_CONTEXT_FROM 197
  #define KVM_CAP_PTP_KVM 198
 -#define KVM_CAP_PPC_RPT_INVALIDATE 199
 +#define KVM_CAP_HYPERV_ENFORCE_CPUID 199
 +#define KVM_CAP_SREGS2 200
 +#define KVM_CAP_EXIT_HYPERCALL 201
++#define KVM_CAP_PPC_RPT_INVALIDATE 202
  
  #ifdef KVM_CAP_IRQ_ROUTING