]> Git Repo - J-linux.git/commitdiff
Merge tag 'v6.9-rc2' into x86/percpu, to pick up fixes and resolve conflict
authorIngo Molnar <[email protected]>
Wed, 3 Apr 2024 06:53:40 +0000 (08:53 +0200)
committerIngo Molnar <[email protected]>
Wed, 3 Apr 2024 06:57:26 +0000 (08:57 +0200)
Conflicts:
arch/x86/Kconfig

Signed-off-by: Ingo Molnar <[email protected]>
1  2 
arch/x86/Kconfig

index 03c9d1100f09401383d67bbe07fc942130ca3261,4fff6ed46e902cfbe723cf5ed5ce517e2d131891..f1c020d2161757e8edf9306248c1b9d68ec360e0
@@@ -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)
This page took 0.061176 seconds and 4 git commands to generate.