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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 1 May 2019 16:09:02 +1000

Hi all,

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

  include/uapi/linux/kvm.h

between commits:

  555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support")
  a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest")

from the kvm-arm tree and commit:

  eacc56bb9de3 ("KVM: PPC: Book3S HV: XIVE: Introduce a new capability KVM_CAP_PPC_IRQ_XIVE")

from the kvm-ppc 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 4dc34f8e29f6,52bf74a1616e..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -988,9 -988,7 +988,10 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_ARM_VM_IPA_SIZE 165
  #define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
  #define KVM_CAP_HYPERV_CPUID 167
 -#define KVM_CAP_PPC_IRQ_XIVE 168
 +#define KVM_CAP_ARM_SVE 168
 +#define KVM_CAP_ARM_PTRAUTH_ADDRESS 169
 +#define KVM_CAP_ARM_PTRAUTH_GENERIC 170
++#define KVM_CAP_PPC_IRQ_XIVE 171
  
  #ifdef KVM_CAP_IRQ_ROUTING