From: Ingo Molnar Date: Wed, 3 Apr 2024 06:53:40 +0000 (+0200) Subject: Merge tag 'v6.9-rc2' into x86/percpu, to pick up fixes and resolve conflict X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6a2bcf9277dcbdef88d514113434b45f8ffc5469;p=linux.git Merge tag 'v6.9-rc2' into x86/percpu, to pick up fixes and resolve conflict Conflicts: arch/x86/Kconfig Signed-off-by: Ingo Molnar --- 6a2bcf9277dcbdef88d514113434b45f8ffc5469 diff --cc arch/x86/Kconfig index 03c9d1100f094,4fff6ed46e902..f1c020d216175 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -2442,10 -2435,12 +2438,12 @@@ config USE_X86_SEG_SUPPOR def_bool y depends on CC_HAS_NAMED_AS # - # -fsanitize=kernel-address (KASAN) is at the moment incompatible - # with named address spaces - see GCC PR sanitizer/111736. + # -fsanitize=kernel-address (KASAN) is incompatible with named + # address spaces with GCC < 13.3 - see GCC PR sanitizer/111736. # - depends on !KASAN + depends on !KASAN || CC_HAS_NAMED_AS_FIXED_ASAN + # -fsanitize=thread (KCSAN) is also incompatible. + depends on !KCSAN config CC_HAS_SLS def_bool $(cc-option,-mharden-sls=all)