drop arm64-vdso32-suppress-error-message-for-make-mrproper.patch from 5.10 and 5.4

diff --git a/queue-5.10/arm64-vdso32-suppress-error-message-for-make-mrproper.patch b/queue-5.10/arm64-vdso32-suppress-error-message-for-make-mrproper.patch
deleted file mode 100644 (file)
index e380c3a..0000000
--- a/queue-5.10/arm64-vdso32-suppress-error-message-for-make-mrproper.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 14831fad73f5ac30ac61760487d95a538e6ab3cb Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers@google.com>
-Date: Tue, 19 Oct 2021 15:36:45 -0700
-Subject: arm64: vdso32: suppress error message for 'make mrproper'
-
-From: Nick Desaulniers <ndesaulniers@google.com>
-
-commit 14831fad73f5ac30ac61760487d95a538e6ab3cb upstream.
-
-When running the following command without arm-linux-gnueabi-gcc in
-one's $PATH, the following warning is observed:
-
-$ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 mrproper
-make[1]: arm-linux-gnueabi-gcc: No such file or directory
-
-This is because KCONFIG is not run for mrproper, so CONFIG_CC_IS_CLANG
-is not set, and we end up eagerly evaluating various variables that try
-to invoke CC_COMPAT.
-
-This is a similar problem to what was observed in
-commit dc960bfeedb0 ("h8300: suppress error messages for 'make clean'")
-
-Reported-by: Lucas Henneman <henneman@google.com>
-Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
-Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
-Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Tested-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20211019223646.1146945-4-ndesaulniers@google.com
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kernel/vdso32/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm64/kernel/vdso32/Makefile
-+++ b/arch/arm64/kernel/vdso32/Makefile
-@@ -48,7 +48,8 @@ cc32-as-instr = $(call try-run,\
- # As a result we set our own flags here.
- 
- # KBUILD_CPPFLAGS and NOSTDINC_FLAGS from top-level Makefile
--VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc -isystem $(shell $(CC_COMPAT) -print-file-name=include)
-+VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc
-+VDSO_CPPFLAGS += -isystem $(shell $(CC_COMPAT) -print-file-name=include)
- VDSO_CPPFLAGS += $(LINUXINCLUDE)
- 
- # Common C and assembly flags

diff --git a/queue-5.10/series b/queue-5.10/series
index 6fc19464b99f4bbb274936a2f388f1eadb2793ba..e1dd168e661d7fb7734afef767e1d1ad4c68938a 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -8,7 +8,6 @@ net-stmmac-fix-missing-unlock-on-error-in-stmmac_suspend.patch
 net-stmmac-fix-system-hang-if-change-mac-address-after-interface-ifdown.patch
 net-stmmac-fix-issue-where-clk-is-being-unprepared-twice.patch
 net-stmmac-dwmac-rk-fix-unbalanced-pm_runtime_enable-warnings.patch
-arm64-vdso32-suppress-error-message-for-make-mrproper.patch
 x86-iopl-fake-iopl-3-cli-sti-usage.patch
 parisc-entry-fix-trace-test-in-syscall-exit-path.patch
 pci-msi-destroy-sysfs-before-freeing-entries.patch
@@ -19,3 +18,4 @@ erofs-fix-unsafe-pagevec-reuse-of-hooked-pclusters.patch
 scripts-lld-version.sh-rewrite-based-on-upstream-ld-version.sh.patch
 perf-core-avoid-put_page-when-gup-fails.patch
 thermal-fix-null-pointer-dereferences-in-of_thermal_-functions.patch
+selftests-x86-iopl-adjust-to-the-faked-iopl-cli-sti-usage.patch

diff --git a/queue-5.4/arm64-vdso32-suppress-error-message-for-make-mrproper.patch b/queue-5.4/arm64-vdso32-suppress-error-message-for-make-mrproper.patch
deleted file mode 100644 (file)
index f844ef4..0000000
--- a/queue-5.4/arm64-vdso32-suppress-error-message-for-make-mrproper.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 14831fad73f5ac30ac61760487d95a538e6ab3cb Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers@google.com>
-Date: Tue, 19 Oct 2021 15:36:45 -0700
-Subject: arm64: vdso32: suppress error message for 'make mrproper'
-
-From: Nick Desaulniers <ndesaulniers@google.com>
-
-commit 14831fad73f5ac30ac61760487d95a538e6ab3cb upstream.
-
-When running the following command without arm-linux-gnueabi-gcc in
-one's $PATH, the following warning is observed:
-
-$ ARCH=arm64 CROSS_COMPILE_COMPAT=arm-linux-gnueabi- make -j72 LLVM=1 mrproper
-make[1]: arm-linux-gnueabi-gcc: No such file or directory
-
-This is because KCONFIG is not run for mrproper, so CONFIG_CC_IS_CLANG
-is not set, and we end up eagerly evaluating various variables that try
-to invoke CC_COMPAT.
-
-This is a similar problem to what was observed in
-commit dc960bfeedb0 ("h8300: suppress error messages for 'make clean'")
-
-Reported-by: Lucas Henneman <henneman@google.com>
-Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
-Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
-Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
-Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-Tested-by: Nathan Chancellor <nathan@kernel.org>
-Link: https://lore.kernel.org/r/20211019223646.1146945-4-ndesaulniers@google.com
-Signed-off-by: Will Deacon <will@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm64/kernel/vdso32/Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/arch/arm64/kernel/vdso32/Makefile
-+++ b/arch/arm64/kernel/vdso32/Makefile
-@@ -32,7 +32,8 @@ cc32-as-instr = $(call try-run,\
- # As a result we set our own flags here.
- 
- # KBUILD_CPPFLAGS and NOSTDINC_FLAGS from top-level Makefile
--VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc -isystem $(shell $(CC_COMPAT) -print-file-name=include)
-+VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc
-+VDSO_CPPFLAGS += -isystem $(shell $(CC_COMPAT) -print-file-name=include)
- VDSO_CPPFLAGS += $(LINUXINCLUDE)
- 
- # Common C and assembly flags

diff --git a/queue-5.4/series b/queue-5.4/series
index c681d40e008390df6d5362cffac9b80ad6501137..a8ead531e5ff0dfbb9264cc533d7c8d4c84b333a 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -4,7 +4,6 @@ mips-fix-assembly-error-from-mipsr2-code-used-within-mips_isa_arch_level.patch
 ext4-fix-lazy-initialization-next-schedule-time-computation-in-more-granular-unit.patch
 scsi-ufs-fix-tm-request-when-non-fatal-error-happens.patch
 fortify-explicitly-disable-clang-support.patch
-arm64-vdso32-suppress-error-message-for-make-mrproper.patch
 parisc-entry-fix-trace-test-in-syscall-exit-path.patch
 pci-msi-destroy-sysfs-before-freeing-entries.patch
 pci-msi-deal-with-devices-lying-about-their-msi-mask-capability.patch