From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 3 Aug 2020 18:19:13 +0000 (-0400)
Subject: Merge tag 'kvm-s390-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f3633c2683545213de4a00a9b0c3fba741321fb2;p=linux.git

Merge tag 'kvm-s390-next-5.9-1' of git://git./linux/kernel/git/kvms390/linux into kvm-next-5.6

KVM: s390: Enhancement for 5.9
- implement diagnose 318
---

f3633c2683545213de4a00a9b0c3fba741321fb2
diff --cc include/uapi/linux/kvm.h
index 2c73dcfb3dbb0,35cdb43079047..f6d86033c4fa3
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1032,9 -1031,7 +1032,9 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_PPC_SECURE_GUEST 181
  #define KVM_CAP_HALT_POLL 182
  #define KVM_CAP_ASYNC_PF_INT 183
 -#define KVM_CAP_S390_DIAG318 184
 +#define KVM_CAP_LAST_CPU 184
 +#define KVM_CAP_SMALLER_MAXPHYADDR 185
- 
++#define KVM_CAP_S390_DIAG318 186
  
  #ifdef KVM_CAP_IRQ_ROUTING