linux-next: manual merge of the arm64 tree with the kbuild tree

[Mark Brown <broonie@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]

Hi all,

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

  arch/arm64/Kconfig

between commit:

  23cb0514208da ("arm64: Remove tautological LLVM Kconfig conditions")

from the kbuild tree and commit:

  1cf89b6bf660c ("arm64: Kconfig: Make CPU_BIG_ENDIAN depend on BROKEN")

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 arch/arm64/Kconfig
index 56eec3586ff77,69bde40e19e23..0000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1492,6 -1494,8 +1494,7 @@@ choic
  
  config CPU_BIG_ENDIAN
  	bool "Build big-endian kernel"
 -	# https://github.com/llvm/llvm-project/commit/1379b150991f70a5782e9a143c2ba5308da1161c
 -	depends on (AS_IS_GNU || AS_VERSION >= 150000) && BROKEN
++	depends on BROKEN
  	help
  	  Say Y if you plan on running a kernel with a big-endian userspace.
  

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]