3.18-stable patches

added patches:
	cifs-fix-handle_cancelled_mid-callback-initialization.patch
	ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch

diff --git a/queue-3.18/cifs-fix-handle_cancelled_mid-callback-initialization.patch b/queue-3.18/cifs-fix-handle_cancelled_mid-callback-initialization.patch
new file mode 100644 (file)
index 0000000..e58fd44
--- /dev/null
+++ b/queue-3.18/cifs-fix-handle_cancelled_mid-callback-initialization.patch
@@ -0,0 +1,44 @@
+From aa0d57e4dd351fa7492351509357514e93aab37b Mon Sep 17 00:00:00 2001
+From: Pavel Shilovsky <pshilov@microsoft.com>
+Date: Wed, 19 Jul 2017 11:26:02 -0700
+Subject: CIFS: Fix handle_cancelled_mid callback initialization
+
+From: Pavel Shilovsky <pshilov@microsoft.com>
+
+Commit 99e214e006cf ("Handle mismatched open calls") was applied with
+errors that result in initializing handle_cancelled_mid callback twice
+in smb21_operations and smb30_operations structures but not initializing
+it in smb20_operations structure.
+
+Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/cifs/smb2ops.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/fs/cifs/smb2ops.c
++++ b/fs/cifs/smb2ops.c
+@@ -1383,6 +1383,7 @@ struct smb_version_operations smb20_oper
+       .clear_stats = smb2_clear_stats,
+       .print_stats = smb2_print_stats,
+       .is_oplock_break = smb2_is_valid_oplock_break,
++      .handle_cancelled_mid = smb2_handle_cancelled_mid,
+       .downgrade_oplock = smb2_downgrade_oplock,
+       .need_neg = smb2_need_neg,
+       .negotiate = smb2_negotiate,
+@@ -1462,7 +1463,6 @@ struct smb_version_operations smb21_oper
+       .print_stats = smb2_print_stats,
+       .is_oplock_break = smb2_is_valid_oplock_break,
+       .handle_cancelled_mid = smb2_handle_cancelled_mid,
+-      .handle_cancelled_mid = smb2_handle_cancelled_mid,
+       .downgrade_oplock = smb2_downgrade_oplock,
+       .need_neg = smb2_need_neg,
+       .negotiate = smb2_negotiate,
+@@ -1545,7 +1545,6 @@ struct smb_version_operations smb30_oper
+       .dump_share_caps = smb2_dump_share_caps,
+       .is_oplock_break = smb2_is_valid_oplock_break,
+       .handle_cancelled_mid = smb2_handle_cancelled_mid,
+-      .handle_cancelled_mid = smb2_handle_cancelled_mid,
+       .downgrade_oplock = smb2_downgrade_oplock,
+       .need_neg = smb2_need_neg,
+       .negotiate = smb2_negotiate,

diff --git a/queue-3.18/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch b/queue-3.18/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch
new file mode 100644 (file)
index 0000000..6a07895
--- /dev/null
+++ b/queue-3.18/ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch
@@ -0,0 +1,41 @@
+From bd7e31bbade02bc1e92aa00d5cf2cee2da66838a Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 11 May 2017 08:46:44 -0300
+Subject: [media] ir-core: fix gcc-7 warning on bool arithmetic
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit bd7e31bbade02bc1e92aa00d5cf2cee2da66838a upstream.
+
+gcc-7 suggests that an expression using a bitwise not and a bitmask
+on a 'bool' variable is better written using boolean logic:
+
+drivers/media/rc/imon.c: In function 'imon_incoming_scancode':
+drivers/media/rc/imon.c:1725:22: error: '~' on a boolean expression [-Werror=bool-operation]
+    ictx->pad_mouse = ~(ictx->pad_mouse) & 0x1;
+                      ^
+drivers/media/rc/imon.c:1725:22: note: did you mean to use logical not?
+
+I agree.
+
+Fixes: 21677cfc562a ("V4L/DVB: ir-core: add imon driver")
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/rc/imon.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/rc/imon.c
++++ b/drivers/media/rc/imon.c
+@@ -1629,7 +1629,7 @@ static void imon_incoming_packet(struct
+       if (kc == KEY_KEYBOARD && !ictx->release_code) {
+               ictx->last_keycode = kc;
+               if (!nomouse) {
+-                      ictx->pad_mouse = ~(ictx->pad_mouse) & 0x1;
++                      ictx->pad_mouse = !ictx->pad_mouse;
+                       dev_dbg(dev, "toggling to %s mode\n",
+                               ictx->pad_mouse ? "mouse" : "keyboard");
+                       spin_unlock_irqrestore(&ictx->kc_lock, flags);

diff --git a/queue-3.18/series b/queue-3.18/series
index d4ae8ed5b84bbb8bcb1f2690596d103ef6f618f2..81002b145534ea44594c52ff221b3cfe3b54c63b 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,3 +1,5 @@
 disable-new-gcc-7.1.1-warnings-for-now.patch
 kvm-x86-memset-whole-irq_eoi.patch
 x86-rtc-remove-duplicate-const-specifier.patch
+ir-core-fix-gcc-7-warning-on-bool-arithmetic.patch
+cifs-fix-handle_cancelled_mid-callback-initialization.patch