linux-next: manual merge of the kvm tree with the kvm-fixes tree

Commit Message

Mark Brown Feb. 23, 2022, 8 p.m. UTC

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  include/uapi/linux/kvm.h

between commit:

  93b71801a8274 ("KVM: PPC: reserve capability 210 for KVM_CAP_PPC_AIL_MODE_3")

from the kvm-fixes tree and commit:

  d004079edc166 ("KVM: s390: Add capability for storage key extension of MEM_OP IOCTL")

from the kvm 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.

+++ b/include/uapi/linux/kvm.h
@@@ -1134,7 -1140,7 +1140,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_VM_GPA_BITS 207
  #define KVM_CAP_XSAVE2 208
  #define KVM_CAP_SYS_ATTRIBUTES 209
 -#define KVM_CAP_S390_MEM_OP_EXTENSION 210
 +#define KVM_CAP_PPC_AIL_MODE_3 210
++#define KVM_CAP_S390_MEM_OP_EXTENSION 211
  
  #ifdef KVM_CAP_IRQ_ROUTING

Patch

diff --cc include/uapi/linux/kvm.h
index 507ee1f2aa96b,dbc550bbd9fa3..0000000000000
--- a/include/uapi/linux/kvm.h