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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Dec 2020 16:17:30 +1100

Hi all,

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

  arch/arm64/include/asm/cpucaps.h

between commit:

  364a5a8ae8dc ("arm64: cpufeatures: Add capability for LDAPR instruction")

from the arm64 tree and commit:

  44e88d43c442 ("KVM: arm64: Add ARM64_KVM_PROTECTED_MODE CPU capability")

from the kvm-arm 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 arch/arm64/include/asm/cpucaps.h
index a7242ef2a2cd,42f850718d4b..000000000000
--- a/arch/arm64/include/asm/cpucaps.h
+++ b/arch/arm64/include/asm/cpucaps.h
@@@ -64,8 -66,8 +64,9 @@@
  #define ARM64_HAS_TLB_RANGE			56
  #define ARM64_MTE				57
  #define ARM64_WORKAROUND_1508412		58
 -#define ARM64_KVM_PROTECTED_MODE		59
 +#define ARM64_HAS_LDAPR				59
++#define ARM64_KVM_PROTECTED_MODE		60
  
--#define ARM64_NCAPS				60
++#define ARM64_NCAPS				61
  
  #endif /* __ASM_CPUCAPS_H */