linux-next: manual merge of the akpm-current tree with the mips tree

[Stephen Rothwell]

Hi all,

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

  arch/Kconfig

between commit:

  04f264d3a8b0 ("compiler.h: Allow arch-specific asm/compiler.h")

from the mips tree and commit:

  7358e371b0ef ("arch: enable relative relocations for arm64, power and x86")

from the akpm-current 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 526a57457594,4426e9687d89..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -848,14 -841,16 +848,24 @@@ config REFCOUNT_FUL
  	  against various use-after-free conditions that can be used in
  	  security flaw exploits.
  
 +config HAVE_ARCH_COMPILER_H
 +	bool
 +	help
 +	  An architecture can select this if it provides an
 +	  asm/compiler.h header that should be included after
 +	  linux/compiler-*.h in order to override macro definitions that those
 +	  headers generally provide.
 +
+ config HAVE_ARCH_PREL32_RELOCATIONS
+ 	bool
+ 	help
+ 	  May be selected by an architecture if it supports place-relative
+ 	  32-bit relocations, both in the toolchain and in the module loader,
+ 	  in which case relative references can be used in special sections
+ 	  for PCI fixup, initcalls etc which are only half the size on 64 bit
+ 	  architectures, and don't require runtime relocation on relocatable
+ 	  kernels.
+ 
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"

Attachment: pgpf7jygZkOVo.pgp
Description: OpenPGP digital signature