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

- SCA rework
- VIRT_XFER_TO_GUEST_WORK support
- Operation exception forwarding support
- Cleanups

diff --cc Documentation/virt/kvm/api.rst
index f38a0cfcbec5c9a3d52f848200b0b7c84095c52b,1bc2a84c59ee71ace07290348dc3848b9a6344d1..01a3abef8abb91e1266939d11b81396aa7dc8282
--- 1/Documentation/virt/kvm/api.rst
--- 2/Documentation/virt/kvm/api.rst
+++ b/Documentation/virt/kvm/api.rst
@@@ -8738,18 -8703,21 +8738,33 @@@ This capability indicate to the userspa
  can be safely mapped as cacheable. This relies on the presence of
  force write back (FWB) feature support on the hardware.
  
 -7.45 KVM_CAP_S390_USER_OPEREXEC
 +7.45 KVM_CAP_ARM_SEA_TO_USER
 +----------------------------
 +
 +:Architecture: arm64
 +:Target: VM
 +:Parameters: none
 +:Returns: 0 on success, -EINVAL if unsupported.
 +
 +When this capability is enabled, KVM may exit to userspace for SEAs taken to
 +EL2 resulting from a guest access. See ``KVM_EXIT_ARM_SEA`` for more
 +information.
 +
++7.46 KVM_CAP_S390_USER_OPEREXEC
+ -------------------------------
+ 
+ :Architectures: s390
+ :Parameters: none
+ 
+ When this capability is enabled KVM forwards all operation exceptions
+ that it doesn't handle itself to user space. This also includes the
+ 0x0000 instructions managed by KVM_CAP_S390_USER_INSTR0. This is
+ helpful if user space wants to emulate instructions which are not
+ (yet) implemented in hardware.
+ 
+ This capability can be enabled dynamically even if VCPUs were already
+ created and are running.
+ 
  8. Other capabilities.
  ======================
  

diff --cc arch/s390/kvm/Kconfig
Simple merge

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

diff --cc include/uapi/linux/kvm.h
index 1e541193e98d33c69df8f6618dd07078a1824f32,8ab07396ce3b02ae641d786c8784a498fc21b365..dddb781b0507dcfe44079118ec1948095e21de3d
--- 1/include/uapi/linux/kvm.h
--- 2/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -972,7 -963,7 +972,8 @@@ struct kvm_enable_cap 
  #define KVM_CAP_RISCV_MP_STATE_RESET 242
  #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
  #define KVM_CAP_GUEST_MEMFD_FLAGS 244
 -#define KVM_CAP_S390_USER_OPEREXEC 245
 +#define KVM_CAP_ARM_SEA_TO_USER 245
++#define KVM_CAP_S390_USER_OPEREXEC 246
  
  struct kvm_irq_routing_irqchip {
        __u32 irqchip;

diff --cc tools/testing/selftests/kvm/Makefile.kvm
Simple merge