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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 2 Sep 2019 09:47:11 +1000

Hi all,

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

  arch/Kconfig

between commit:

  5cf896fb6be3 ("arm64: Add support for relocating the kernel with RELR relocations")

from the arm64 tree and commit:

  0c9c1d563975 ("x86, s390: Move ARCH_HAS_MEM_ENCRYPT definition to arch/Kconfig")

from the powerpc 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/Kconfig
index 6f4d3e9bf486,89e2e3f64f79..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -932,20 -925,9 +932,23 @@@ config LOCK_EVENT_COUNT
  	  the chance of application behavior change because of timing
  	  differences. The counts are reported via debugfs.
  
 +# Select if the architecture has support for applying RELR relocations.
 +config ARCH_HAS_RELR
 +	bool
 +
 +config RELR
 +	bool "Use RELR relocation packing"
 +	depends on ARCH_HAS_RELR && TOOLS_SUPPORT_RELR
 +	default y
 +	help
 +	  Store the kernel's dynamic relocations in the RELR relocation packing
 +	  format. Requires a compatible linker (LLD supports this feature), as
 +	  well as compatible NM and OBJCOPY utilities (llvm-nm and llvm-objcopy
 +	  are compatible).
 +
+ config ARCH_HAS_MEM_ENCRYPT
+ 	bool
+ 
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"