Merge tag 'kvm-s390-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

KVM: s390: Enhancement for 5.9
- implement diagnose 318

diff --cc arch/s390/include/asm/kvm_host.h
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
Simple merge

diff --cc include/uapi/linux/kvm.h
index 2c73dcfb3dbb02fd3e7a68cfc6caa57b493a31d2,35cdb430790472f9dc642094a7b8d08aacb4b5e3..f6d86033c4fa3d21cc7c643c85d443b053c704c9
--- 1/include/uapi/linux/kvm.h
--- 2/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