From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 31 Jul 2015 00:11:18 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v4.1.4~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99ee4ff8c3d56b4c8714eb0cb29885f78a77db48;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	md-fix-a-build-warning.patch
---

diff --git a/queue-3.10/md-fix-a-build-warning.patch b/queue-3.10/md-fix-a-build-warning.patch
new file mode 100644
index 00000000000..c4aad71a8c9
--- /dev/null
+++ b/queue-3.10/md-fix-a-build-warning.patch
@@ -0,0 +1,38 @@
+From 4e023612325a9034a542bfab79f78b1fe5ebb841 Mon Sep 17 00:00:00 2001
+From: Firo Yang <firogm@gmail.com>
+Date: Thu, 11 Jun 2015 09:41:10 +0800
+Subject: md: fix a build warning
+
+From: Firo Yang <firogm@gmail.com>
+
+commit 4e023612325a9034a542bfab79f78b1fe5ebb841 upstream.
+
+Warning like this:
+
+drivers/md/md.c: In function "update_array_info":
+drivers/md/md.c:6394:26: warning: logical not is only applied
+to the left hand side of comparison [-Wlogical-not-parentheses]
+      !mddev->persistent  != info->not_persistent||
+
+Fix it as Neil Brown said:
+mddev->persistent != !info->not_persistent ||
+
+Signed-off-by: Firo Yang <firogm@gmail.com>
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/md/md.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/md/md.c
++++ b/drivers/md/md.c
+@@ -6221,7 +6221,7 @@ static int update_array_info(struct mdde
+ 	    mddev->ctime         != info->ctime         ||
+ 	    mddev->level         != info->level         ||
+ /*	    mddev->layout        != info->layout        || */
+-	    !mddev->persistent	 != info->not_persistent||
++	    mddev->persistent	 != !info->not_persistent ||
+ 	    mddev->chunk_sectors != info->chunk_size >> 9 ||
+ 	    /* ignore bottom 8 bits of state, and allow SB_BITMAP_PRESENT to change */
+ 	    ((state^info->state) & 0xfffffe00)
diff --git a/queue-3.10/series b/queue-3.10/series
index 17a3ef3f601..fae9fed3536 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -62,3 +62,4 @@ tracing-filter-do-not-allow-infix-to-exceed-end-of-string.patch
 tracing-have-branch-tracer-use-recursive-field-of-task-struct.patch
 dmaengine-mv_xor-bug-fix-for-racing-condition-in-descriptors-cleanup.patch
 hwmon-mcp3021-fix-broken-output-scaling.patch
+md-fix-a-build-warning.patch