Messages in this thread | | | Date | Tue, 15 Mar 2022 21:49:24 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the kspp tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
arch/arm64/Kconfig
between commit:
6e2edd6371a4 ("arm64: Ensure execute-only permissions are not allowed without EPAN")
from Linus' tree and commit:
afcf5441b9ff ("arm64: Add gcc Shadow Call Stack support")
from the kspp 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 181679ffedac,de01e77f4db7..000000000000 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@@ -1259,7 -1252,10 +1260,7 @@@ config HW_PERF_EVENT def_bool y depends on ARM_PMU - # Supported by clang >= 7.0 -config ARCH_HAS_FILTER_PGPROT - def_bool y - + # Supported by clang >= 7.0 or GCC >= 12.0.0 config CC_HAVE_SHADOW_CALL_STACK def_bool $(cc-option, -fsanitize=shadow-call-stack -ffixed-x18) [unhandled content-type:application/pgp-signature] | |