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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Nov 2022 14:03:04 +1100

Hi all,

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

  include/uapi/linux/kvm.h

between commit:

  86bdf3ebcfe1 ("KVM: Support dirty ring in conjunction with bitmap")

from the kvm-arm tree and commit:

  57ecc06995f9 ("KVM: s390: pv: add KVM_CAP_S390_PROTECTED_ASYNC_DISABLE")

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 c87b5882d7ae,d3f86a280858..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1178,7 -1178,7 +1178,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_S390_ZPCI_OP 221
  #define KVM_CAP_S390_CPU_TOPOLOGY 222
  #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223
 -#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224
 +#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 224
++#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 225
  
  #ifdef KVM_CAP_IRQ_ROUTING