kbuild: drop already applied patch

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 31 insertions, 100 deletions

diff --git a/queue/kbuild-do-not-call-cc-option-before-KBUILD_CFLAGS-in.patch b/queue/kbuild-do-not-call-cc-option-before-KBUILD_CFLAGS-in.patch
deleted file mode 100644
index 5a36488..0000000
--- a/queue/kbuild-do-not-call-cc-option-before-KBUILD_CFLAGS-in.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 433dc2ebe7d17dd21cba7ad5c362d37323592236 Mon Sep 17 00:00:00 2001
-From: Masahiro Yamada <yamada.masahiro@socionext.com>
-Date: Thu, 12 Oct 2017 18:22:25 +0900
-Subject: [PATCH] kbuild: do not call cc-option before KBUILD_CFLAGS
- initialization
-
-commit 433dc2ebe7d17dd21cba7ad5c362d37323592236 upstream.
-
-Some $(call cc-option,...) are invoked very early, even before
-KBUILD_CFLAGS, etc. are initialized.
-
-The returned string from $(call cc-option,...) depends on
-KBUILD_CPPFLAGS, KBUILD_CFLAGS, and GCC_PLUGINS_CFLAGS.
-
-Since they are exported, they are not empty when the top Makefile
-is recursively invoked.
-
-The recursion occurs in several places.  For example, the top
-Makefile invokes itself for silentoldconfig.  "make tinyconfig",
-"make rpm-pkg" are the cases, too.
-
-In those cases, the second call of cc-option from the same line
-runs a different shell command due to non-pristine KBUILD_CFLAGS.
-
-To get the same result all the time, KBUILD_* and GCC_PLUGINS_CFLAGS
-must be initialized before any call of cc-option.  This avoids
-garbage data in the .cache.mk file.
-
-Move all calls of cc-option below the config targets because target
-compiler flags are unnecessary for Kconfig.
-
-Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-Reviewed-by: Douglas Anderson <dianders@chromium.org>
-
-diff --git a/Makefile b/Makefile
-index d3e6fccfad9b..a7476e6934f1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -392,9 +392,6 @@ LDFLAGS_MODULE  =
- CFLAGS_KERNEL	=
- AFLAGS_KERNEL	=
- LDFLAGS_vmlinux =
--CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
--CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
--
- 
- # Use USERINCLUDE when you must reference the UAPI directories only.
- USERINCLUDE    := \
-@@ -413,21 +410,19 @@ LINUXINCLUDE    := \
- 		-I$(objtree)/include \
- 		$(USERINCLUDE)
- 
--KBUILD_CPPFLAGS := -D__KERNEL__
--
-+KBUILD_AFLAGS   := -D__ASSEMBLY__
- KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
- 		   -fno-strict-aliasing -fno-common -fshort-wchar \
- 		   -Werror-implicit-function-declaration \
- 		   -Wno-format-security \
--		   -std=gnu89 $(call cc-option,-fno-PIE)
--
--
-+		   -std=gnu89
-+KBUILD_CPPFLAGS := -D__KERNEL__
- KBUILD_AFLAGS_KERNEL :=
- KBUILD_CFLAGS_KERNEL :=
--KBUILD_AFLAGS   := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)
- KBUILD_AFLAGS_MODULE  := -DMODULE
- KBUILD_CFLAGS_MODULE  := -DMODULE
- KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
-+GCC_PLUGINS_CFLAGS :=
- 
- export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
- export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES
-@@ -435,7 +430,7 @@ export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE
- export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
- 
- export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
--export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV CFLAGS_KCOV CFLAGS_KASAN CFLAGS_UBSAN
-+export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_KASAN CFLAGS_UBSAN
- export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
- export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
- export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
-@@ -607,6 +602,12 @@ endif
- # Defaults to vmlinux, but the arch makefile usually adds further targets
- all: vmlinux
- 
-+KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)
-+KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
-+CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
-+CFLAGS_KCOV	:= $(call cc-option,-fsanitize-coverage=trace-pc,)
-+export CFLAGS_GCOV CFLAGS_KCOV
-+
- # The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
- # values of the respective KBUILD_* variables
- ARCH_CPPFLAGS :=
--- 
-2.15.0
-
diff --git a/queue/series b/queue/series
index 9b0e916..c228f2c 100644
--- a/queue/series
+++ b/queue/series
@@ -96,7 +96,6 @@ bnxt_re-changing-the-ip-address-shouldn-t-affect-new.patch
 IB-mlx4-Increase-maximal-message-size-under-UD-QP.patch
 IB-mlx5-Assign-send-CQ-and-recv-CQ-of-UMR-QP.patch
 afs-Connect-up-the-CB.ProbeUuid.patch
-kbuild-do-not-call-cc-option-before-KBUILD_CFLAGS-in.patch
 powerpc-powernv-idle-Round-up-latency-and-residency-.patch
 ipvlan-fix-ipv6-outbound-device.patch
 ide-ide-atapi-fix-compile-error-with-defining-macro-.patch
diff --git a/queue/x b/queue/x
new file mode 100644
index 0000000..0e22e4c
--- /dev/null
+++ b/queue/x
@@ -0,0 +1,31 @@
+IB-core-Only-enforce-security-for-InfiniBand.patch
+KVM-arm-arm64-vgic-irqfd-Fix-MSI-entry-allocation.patch
+KVM-x86-fix-APIC-page-invalidation.patch
+Revert-powerpc-Do-not-call-ppc_md.panic-in-fadump-pa.patch
+apparmor-fix-leak-of-null-profile-name-if-profile-al.patch
+clk-stm32h7-fix-test-of-clock-config.patch
+clk-sunxi-ng-a83t-Fix-i2c-buses-bits.patch
+cls_bpf-don-t-decrement-net-s-refcount-when-offload-.patch
+dvb_frontend-don-t-use-after-free-the-frontend-struc.patch
+fcntl-don-t-cap-l_start-and-l_end-values-for-F_GETLK.patch
+fcntl-don-t-leak-fd-reference-when-fixup_compat_floc.patch
+firmware-cleanup-FIRMWARE_IN_KERNEL-message.patch
+iio-adc-meson-saradc-Meson8-and-Meson8b-do-not-have-.patch
+iio-adc-meson-saradc-initialize-the-bandgap-correctl.patch
+iio-stm32-fix-adc-trigger-link-error.patch
+media-dvb-core-always-call-invoke_release-in-fe_free.patch
+media-rc-partial-revert-of-media-rc-per-protocol-rep.patch
+net-accept-UFO-datagrams-from-tuntap-and-packet.patch
+net-ipv6-Fixup-device-for-anycast-routes-during-copy.patch
+net-sched-cbq-create-block-for-q-link.block.patch
+net-smc-use-sk_rcvbuf-as-start-for-rmb-creation.patch
+nfp-fix-flower-offload-metadata-flag-usage.patch
+nfp-inherit-the-max_mtu-from-the-PF-netdev.patch
+nvmet-rdma-update-queue-list-during-ib_device-remova.patch
+rsi-fix-memory-leak-on-buf-and-usb_reg_buf.patch
+s390-mm-fix-off-by-one-bug-in-5-level-page-table-han.patch
+sctp-use-right-member-as-the-param-of-list_for_each_.patch
+tcp-when-scheduling-TLP-time-of-RTO-should-account-f.patch
+tls-Use-kzalloc-for-aead_request-allocation.patch
+tun-fix-rcu_read_lock-imbalance-in-tun_build_skb.patch
+xfs-fix-forgotten-rcu-read-unlock-when-skipping-inod.patch