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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 10 Nov 2022 14:55:01 +1100

Hi all,

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

  arch/arm64/Kconfig

between commit:

  3b619e22c460 ("arm64: implement dynamic shadow call stack for Clang")

from the arm64 tree and commit:

  f5a681d23888 ("arm64: Remove CONFIG_ARCH_NR_GPIO")

from the gpio-brgl 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/arm64/Kconfig
index ed9c184ccc6b,a0c36763d954..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -2150,27 -2145,6 +2150,15 @@@ config STACKPROTECTOR_PER_TAS
  	def_bool y
  	depends on STACKPROTECTOR && CC_HAVE_STACKPROTECTOR_SYSREG
  
- # The GPIO number here must be sorted by descending number. In case of
- # a multiplatform kernel, we just want the highest value required by the
- # selected platforms.
- config ARCH_NR_GPIO
-         int
-         default 2048 if ARCH_APPLE
-         default 0
-         help
-           Maximum number of GPIOs in the system.
- 
-           If unsure, leave the default value.
- 
 +config UNWIND_PATCH_PAC_INTO_SCS
 +	bool "Enable shadow call stack dynamically using code patching"
 +	# needs Clang with https://reviews.llvm.org/D111780 incorporated
 +	depends on CC_IS_CLANG && CLANG_VERSION >= 150000
 +	depends on ARM64_PTR_AUTH_KERNEL && CC_HAS_BRANCH_PROT_PAC_RET
 +	depends on SHADOW_CALL_STACK
 +	select UNWIND_TABLES
 +	select DYNAMIC_SCS
 +
  endmenu # "Kernel Features"
  
  menu "Boot options"