Does that patch title need an ", arm64" in it, like the others? On Fri, Sep 25, 2020 at 12:50AM +0200, Andrey Konovalov wrote: > Software tag-based KASAN provides its own tag checking machinery that > can conflict with MTE. Don't allow enabling software tag-based KASAN > when MTE is enabled. > > Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx> > Reviewed-by: Catalin Marinas <catalin.marinas@xxxxxxx> > --- > Change-Id: Icd29bd0c6b1d3d7a0ee3d50c20490f404d34fc97 > --- > arch/arm64/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index e7450fbd0aa7..e875db8e1c86 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -131,7 +131,7 @@ config ARM64 > select HAVE_ARCH_JUMP_LABEL > select HAVE_ARCH_JUMP_LABEL_RELATIVE > select HAVE_ARCH_KASAN if !(ARM64_16K_PAGES && ARM64_VA_BITS_48) > - select HAVE_ARCH_KASAN_SW_TAGS if HAVE_ARCH_KASAN > + select HAVE_ARCH_KASAN_SW_TAGS if (HAVE_ARCH_KASAN && !ARM64_MTE) > select HAVE_ARCH_KGDB > select HAVE_ARCH_MMAP_RND_BITS > select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT > -- > 2.28.0.681.g6f77f65b4e-goog >
