linux-next: manual merge of the kvms390 tree with the kvm-arm tree

[Stephen Rothwell]

Hi all,

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

  include/uapi/linux/kvm.h

between commit:

  ad9c62bd8946 ("KVM: arm64: VM exit to userspace to handle 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 include/uapi/linux/kvm.h
index 1e541193e98d,8ab07396ce3b..000000000000
--- a/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;

Attachment: pgp26D20RXph7.pgp
Description: OpenPGP digital signature