From: Greg Kroah-Hartman Date: Tue, 13 Mar 2018 09:05:35 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.14.27~24 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=038afcabfed8cde8f5e42cedecbafedf95cb7c1c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: kbuild-move-_all-target-out-of-kbuild_src-conditional.patch --- diff --git a/queue-4.14/kbuild-move-_all-target-out-of-kbuild_src-conditional.patch b/queue-4.14/kbuild-move-_all-target-out-of-kbuild_src-conditional.patch new file mode 100644 index 00000000000..ecbb073d916 --- /dev/null +++ b/queue-4.14/kbuild-move-_all-target-out-of-kbuild_src-conditional.patch @@ -0,0 +1,51 @@ +From ba634eceb535d95e87ef09caae7814b3687c6036 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Wed, 4 Oct 2017 12:56:05 +0900 +Subject: kbuild: move "_all" target out of $(KBUILD_SRC) conditional + +From: Masahiro Yamada + +commit ba634eceb535d95e87ef09caae7814b3687c6036 upstream. + +The first "_all" occurrence around line 120 is only visible when +KBUILD_SRC is unset. + +If O=... is specified, the working directory is relocated, then the +only second occurrence around line 193 is visible, that is not set +to PHONY. + +Move the first one to an always visible place. This clarifies "_all" +is our default target and it is always set to PHONY. + +Signed-off-by: Masahiro Yamada +Reviewed-by: Douglas Anderson +Signed-off-by: Greg Kroah-Hartman + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -11,6 +11,10 @@ NAME = Petit Gorille + # Comments in this file are targeted only to the developer, do not + # expect to learn how to build the kernel reading this file. + ++# That's our default target when none is given on the command line ++PHONY := _all ++_all: ++ + # o Do not use make's built-in rules and variables + # (this increases performance and avoids hard-to-debug behaviour); + # o Look for make include files relative to root of kernel src +@@ -117,10 +121,6 @@ ifeq ("$(origin O)", "command line") + KBUILD_OUTPUT := $(O) + endif + +-# That's our default target when none is given on the command line +-PHONY := _all +-_all: +- + # Cancel implicit rules on top Makefile + $(CURDIR)/Makefile Makefile: ; + diff --git a/queue-4.14/series b/queue-4.14/series index 6f446714cc6..b1da708ff51 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,3 +1,4 @@ +kbuild-move-_all-target-out-of-kbuild_src-conditional.patch rdma-ucma-limit-possible-option-size.patch rdma-ucma-check-that-user-doesn-t-overflow-qp-state.patch rdma-mlx5-fix-integer-overflow-while-resizing-cq.patch