linux-next: manual merge of the arm64 tree with the compiler-attributes tree

[Mark Brown]

Hi all,

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

  init/Kconfig

between commit:

  eb111869301e15b7373 ("compiler-types.h: add asm_inline definition")

from the compiler-attributes tree and commit:

  2d122942484c20b ("Revert "init/Kconfig: Fix infinite Kconfig recursion on PPC"")

from the arm64 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.

diff --cc init/Kconfig
index 257e428c90472,d96127ebc44e0..cebadd0cfa50e
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -30,9 -30,9 +30,12 @@@ config CC_CAN_LIN
  config CC_HAS_ASM_GOTO
        def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC))
  
 +config CC_HAS_ASM_INLINE
 +      def_bool $(success,echo 'void foo(void) { asm inline (""); }' | $(CC) -x c - -c -o /dev/null)
 +
+ config TOOLS_SUPPORT_RELR
+       def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh)
+ 
  config CC_HAS_WARN_MAYBE_UNINITIALIZED
        def_bool $(cc-option,-Wmaybe-uninitialized)
        help

Attachment: signature.asc
Description: PGP signature