drop 4.9 tools patch

diff --git a/queue-4.9/series b/queue-4.9/series
index df3e7a0b9da1c7657a610d02f0c9280248148a9e..7b84c0d3c92420c5dba748339d2982e3e455315e 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -39,7 +39,6 @@ hid-hiddev-fix-potential-spectre-v1.patch
 hid-debug-check-length-before-copy_to_user.patch
 pm-opp-update-voltage-in-case-freq-old_freq.patch
 kbuild-fix-escaping-in-.cmd-files-for-future-make.patch
-tools-build-build.include-fix-escaping-in-.cmd-files-for.patch
 media-cx25840-use-subdev-host-data-for-pll-override.patch
 mm-page_alloc-do-not-break-__gfp_thisnode-by-zonelist-reset.patch
 dm-bufio-avoid-sleeping-while-holding-the-dm_bufio-lock.patch

diff --git a/queue-4.9/tools-build-build.include-fix-escaping-in-.cmd-files-for.patch b/queue-4.9/tools-build-build.include-fix-escaping-in-.cmd-files-for.patch
deleted file mode 100644 (file)
index 8bf8f3c..0000000
--- a/queue-4.9/tools-build-build.include-fix-escaping-in-.cmd-files-for.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cdfc04d354e38b4e727d4e513962310389847414 Mon Sep 17 00:00:00 2001
-From: Paul Menzel <pmenzel@molgen.mpg.de>
-Date: Tue, 5 Jun 2018 19:00:22 +0200
-Subject: tools/build/Build.include: fix # escaping in .cmd files for future Make
-
-From: Paul Menzel <pmenzel@molgen.mpg.de>
-
-In 2016 make made a backwards incompatible change to the way '#'
-characters were handled in Makefiles when used inside functions or
-macros:
-
-http://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b57
-
-Due to this change, when attempting to run `make prepare' I get a
-spurious make syntax error:
-
-    /home/earnest/linux/tools/objtool/.fixdep.o.cmd:1: *** missing separator.  Stop.
-
-When inspecting `.fixdep.o.cmd' it includes two lines which use
-unescaped comment characters at the top:
-
-    \# cannot find fixdep (/home/earnest/linux/tools/objtool//fixdep)
-    \# using basic dep data
-
-This is because `tools/build/Build.include' prints these '\#'
-characters:
-
-    printf '\# cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
-    printf '\# using basic dep data\n\n' >> $(dot-target).cmd;           \
-
-This completes commit 9564a8cf (Kbuild: fix # escaping in .cmd files for
-future Make).
-
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=197847
-Cc: Randy Dunlap <rdunlap@infradead.org>
-Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
-Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
-Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- tools/build/Build.include |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/tools/build/Build.include
-+++ b/tools/build/Build.include
-@@ -63,8 +63,8 @@ dep-cmd = $(if $(wildcard $(fixdep)),
-            $(fixdep) $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;           \
-            rm -f $(depfile);                                                    \
-            mv -f $(dot-target).tmp $(dot-target).cmd,                           \
--           printf '\# cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
--           printf '\# using basic dep data\n\n' >> $(dot-target).cmd;           \
-+           printf '$(pound) cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
-+           printf '$(pound) using basic dep data\n\n' >> $(dot-target).cmd;           \
-            cat $(depfile) >> $(dot-target).cmd;                                 \
-            printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd)
-