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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 30 Sep 2020 16:26:13 +1000

Hi all,

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

  arch/arm64/kvm/hyp/Makefile

between commit:

  5359a87d5bda ("KVM: arm64: Replace CONFIG_KVM_INDIRECT_VECTORS with CONFIG_RANDOMIZE_BASE")
  9ef2b48be9bb ("KVM: arm64: Allow patching EL2 vectors even with KASLR is not enabled")

from the arm64 tree and commit:

  b1e57de62cfb ("KVM: arm64: Add stand-alone page-table walker infrastructure")

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/kvm/hyp/Makefile
index d898f0da5802,607b8a898826..000000000000
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@@ -10,4 -10,5 +10,4 @@@ subdir-ccflags-y := -I$(incdir)				
  		    -DDISABLE_BRANCH_PROFILING		\
  		    $(DISABLE_STACKLEAK_PLUGIN)
  
- obj-$(CONFIG_KVM) += vhe/ nvhe/ smccc_wa.o
 -obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o
 -obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o
++obj-$(CONFIG_KVM) += vhe/ nvhe/ smccc_wa.o pgtable.o