Hi all,

Today's linux-next merge of the kvms390 tree got a conflict in:

  Documentation/virt/kvm/api.rst

between commit:

  4debb5e8952e ("Documentation: kvm: new UAPI for handling SEA")

from the kvm-arm tree and commit:

  cd18223397ec ("KVM: s390: Add capability that forwards operation exceptions")

from the kvms390 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/virt/kvm/api.rst
index 27f726ff8fe0,9d2b1c08d321..000000000000
--- a/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.
  ======================