[folded-merged] kasan-fix-hwasan-build-for-gcc-fix.patch removed from -mm tree

[folded-merged] kasan-fix-hwasan-build-for-gcc-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: kasan-fix-hwasan-build-for-gcc-fix
has been removed from the -mm tree.  Its filename was
     kasan-fix-hwasan-build-for-gcc-fix.patch

This patch was dropped because it was folded into kasan-fix-hwasan-build-for-gcc.patch

------------------------------------------------------
From: Marco Elver <elver@google.com>
Subject: kasan-fix-hwasan-build-for-gcc-fix

fixup for "kasan: fix hwasan build for gcc"

Link: https://lkml.kernel.org/r/YHQZVfVVLE/LDK2v@elver.google.com
Signed-off-by: Marco Elver <elver@google.com>
Acked-byh: Andrey Konovalov <andreyknvl@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 scripts/Makefile.kasan |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/scripts/Makefile.kasan~kasan-fix-hwasan-build-for-gcc-fix
+++ a/scripts/Makefile.kasan
@@ -2,6 +2,8 @@
 CFLAGS_KASAN_NOSANITIZE := -fno-builtin
 KASAN_SHADOW_OFFSET ?= $(CONFIG_KASAN_SHADOW_OFFSET)
 
+cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))
+
 ifdef CONFIG_KASAN_GENERIC
 
 ifdef CONFIG_KASAN_INLINE
@@ -12,8 +14,6 @@ endif
 
 CFLAGS_KASAN_MINIMAL := -fsanitize=kernel-address
 
-cc-param = $(call cc-option, -mllvm -$(1), $(call cc-option, --param $(1)))
-
 # -fasan-shadow-offset fails without -fsanitize
 CFLAGS_KASAN_SHADOW := $(call cc-option, -fsanitize=kernel-address \
 			-fasan-shadow-offset=$(KASAN_SHADOW_OFFSET), \
_

Patches currently in -mm which might be from elver@google.com are

kasan-fix-hwasan-build-for-gcc.patch
kfence-zero-guard-page-after-out-of-bounds-access.patch