4.9-stable patches

added patches:
	powerpc-fix-build-errors-in-stable-tree.patch

diff --git a/queue-4.9/powerpc-64s-simple-rfi-macro-conversions.patch b/queue-4.9/powerpc-fix-build-errors-in-stable-tree.patch
similarity index 54%
rename from queue-4.9/powerpc-64s-simple-rfi-macro-conversions.patch
rename to queue-4.9/powerpc-fix-build-errors-in-stable-tree.patch
index fd08dcd26d5ca3abdcece734227f09a91670de27..bba77e3efced8c9a1a7a4312f5a9104a082c30aa 100644 (file)
--- a/queue-4.9/powerpc-64s-simple-rfi-macro-conversions.patch
+++ b/queue-4.9/powerpc-fix-build-errors-in-stable-tree.patch
@@ -1,22 +1,20 @@
 From 222f20f140623ef6033491d0103ee0875fe87d35 Mon Sep 17 00:00:00 2001
 From: Nicholas Piggin <npiggin@gmail.com>
 Date: Wed, 10 Jan 2018 03:07:15 +1100
-Subject: powerpc/64s: Simple RFI macro conversions
+Subject: powerpc: fix build errors in stable tree
 
 From: Nicholas Piggin <npiggin@gmail.com>
 
-commit 222f20f140623ef6033491d0103ee0875fe87d35 upstream.
+This is just the first chunk of commit
+222f20f140623ef6033491d0103ee0875fe87d35 upstream.
 
-[just the top part of this commit, to fix a 4.9.y build error - gregkh]
+to fix a build error in the powerpc tree due to other backports
+happening (and this full patch not being backported).
 
-This commit does simple conversions of rfi/rfid to the new macros that
-include the expected destination context. By simple we mean cases
-where there is a single well known destination context, and it's
-simply a matter of substituting the instruction for the appropriate
-macro.
-
-Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
-Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Reported-by: Yves-Alexis Perez <corsac@debian.org>
+Cc: Nicholas Piggin <npiggin@gmail.com>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
 Cc: Yves-Alexis Perez <corsac@debian.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 

diff --git a/queue-4.9/series b/queue-4.9/series
index 1b6cf8f72c474586fb2a55a15506e05911c4baad..9a5fb5637fb00fa82060825758ee2c4a623af78a 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,5 +1,5 @@
 scsi-smartpqi-allow-static-build-built-in.patch
-powerpc-64s-simple-rfi-macro-conversions.patch
+powerpc-fix-build-errors-in-stable-tree.patch
 ib-qib-fix-comparison-error-with-qperf-compare-swap-test.patch
 ib-mlx4-fix-incorrectly-releasing-steerable-ud-qps-when-have-only-eth-ports.patch
 kselftest-fix-oom-in-memory-compaction-test.patch