linux-next: manual merge of the arm tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  init/Kconfig

between commit:

  b688f369ae0d ("compiler_types: Introduce __nonstring_array")

from Linus' tree and commit:

  e7607f7d6d81 ("ARM: 9443/1: Require linker to support KEEP within OVERLAY for DCE")

from the 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 init/Kconfig
index 18717967fc8c,fc994f5cd5db..000000000000
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -129,9 -129,11 +129,14 @@@ config CC_HAS_COUNTED_B
  	# https://github.com/llvm/llvm-project/pull/112636
  	depends on !(CC_IS_CLANG && CLANG_VERSION < 190103)
  
 +config CC_HAS_MULTIDIMENSIONAL_NONSTRING
 +	def_bool $(success,echo 'char tag[][4] __attribute__((__nonstring__)) = { };' | $(CC) $(CLANG_FLAGS) -x c - -c -o /dev/null -Werror)
 +
+ config LD_CAN_USE_KEEP_IN_OVERLAY
+ 	# ld.lld prior to 21.0.0 did not support KEEP within an overlay description
+ 	# https://github.com/llvm/llvm-project/pull/130661
+ 	def_bool LD_IS_BFD || LLD_VERSION >= 210000
+ 
  config RUSTC_HAS_COERCE_POINTEE
  	def_bool RUSTC_VERSION >= 108400

Attachment: pgpwHapM_UvlI.pgp
Description: OpenPGP digital signature