4.1-stable patches

added patches:
	tools-selftests-fix-clean-target-with-make-3.81.patch

diff --git a/queue-4.1/series b/queue-4.1/series
index 190b863c5e2707a4d6a5fcca125681e6a13cfe0e..317d1bddc108ba9c6a3a8c8ec5b8f661de493d95 100644 (file)
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -24,3 +24,4 @@ acpi-init-switch-over-platform-to-the-acpi-mode-later.patch
 acpi-pm-add-missing-pm_generic_complete-invocation.patch
 acpi-pnp-avoid-conflicting-resource-reservations.patch
 iio-accel-kxcjk-1013-add-the-kxcj9000-acpi-id.patch
+tools-selftests-fix-clean-target-with-make-3.81.patch

diff --git a/queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch b/queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch
new file mode 100644 (file)
index 0000000..95bdb62
--- /dev/null
+++ b/queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch
@@ -0,0 +1,38 @@
+From 60df4642a83546fa6ea8286f5094ce8c0906c3ec Mon Sep 17 00:00:00 2001
+From: Arnaldo Carvalho de Melo <acme@kernel.org>
+Date: Thu, 14 May 2015 16:55:18 -0300
+Subject: tools selftests: Fix 'clean' target with make 3.81
+
+From: Arnaldo Carvalho de Melo <acme@kernel.org>
+
+commit 60df4642a83546fa6ea8286f5094ce8c0906c3ec upstream.
+
+Make 3.81 doesn't have the 'undefine' command. Using undefine
+to clear LDFLAGS fails when make version 3.81 is used. Fix it
+to use override to clear LDFLAGS.
+
+Tested-by: Shuah Khan <shuahkh@osg.samsung.com>
+Cc: David Ahern <dsahern@gmail.com>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Link: http://lkml.kernel.org/r/20150514151225.GH23588@kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
+Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/testing/selftests/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/testing/selftests/Makefile
++++ b/tools/testing/selftests/Makefile
+@@ -27,7 +27,7 @@ TARGETS_HOTPLUG += memory-hotplug
+ # Makefile to avoid test build failures when test
+ # Makefile doesn't have explicit build rules.
+ ifeq (1,$(MAKELEVEL))
+-undefine LDFLAGS
++override LDFLAGS =
+ override MAKEFLAGS =
+ endif
+