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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 31 Jul 2018 14:23:39 +1000

Hi all,

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

  include/uapi/linux/kvm.h

between commit:

  be26b3a73413 ("arm64: KVM: export the capability to set guest SError syndrome")

from the kvm-arm tree and commit:

  a449938297e5 ("KVM: s390: Add huge page enablement control")

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 a7d9bc4e4068,b955b986b341..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -949,7 -949,7 +949,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_GET_MSR_FEATURES 153
  #define KVM_CAP_HYPERV_EVENTFD 154
  #define KVM_CAP_HYPERV_TLBFLUSH 155
 -#define KVM_CAP_S390_HPAGE_1M 156
 +#define KVM_CAP_ARM_INJECT_SERROR_ESR 156
++#define KVM_CAP_S390_HPAGE_1M 157
  
  #ifdef KVM_CAP_IRQ_ROUTING