3.18-stable patches

added patches:
	input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
	iscsi_ibft-fix-missing-break-in-switch-statement.patch

diff --git a/queue-3.18/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch b/queue-3.18/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
new file mode 100644 (file)
index 0000000..9c9f8fa
--- /dev/null
+++ b/queue-3.18/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
@@ -0,0 +1,43 @@
+From 44fc95e218a09d7966a9d448941fdb003f6bb69f Mon Sep 17 00:00:00 2001
+From: Jason Gerecke <jason.gerecke@wacom.com>
+Date: Sat, 9 Mar 2019 15:32:13 -0800
+Subject: Input: wacom_serial4 - add support for Wacom ArtPad II tablet
+
+From: Jason Gerecke <jason.gerecke@wacom.com>
+
+commit 44fc95e218a09d7966a9d448941fdb003f6bb69f upstream.
+
+Tablet initially begins communicating at 9600 baud, so this command
+should be used to connect to the device:
+
+    $ inputattach --daemon --baud 9600 --wacom_iv /dev/ttyS0
+
+https://github.com/linuxwacom/xf86-input-wacom/issues/40
+
+Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/input/tablet/wacom_serial4.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/input/tablet/wacom_serial4.c
++++ b/drivers/input/tablet/wacom_serial4.c
+@@ -187,6 +187,7 @@ enum {
+       MODEL_DIGITIZER_II      = 0x5544, /* UD */
+       MODEL_GRAPHIRE          = 0x4554, /* ET */
+       MODEL_PENPARTNER        = 0x4354, /* CT */
++      MODEL_ARTPAD_II         = 0x4B54, /* KT */
+ };
+ 
+ static void wacom_handle_model_response(struct wacom *wacom)
+@@ -245,6 +246,7 @@ static void wacom_handle_model_response(
+               wacom->flags = F_HAS_STYLUS2 | F_HAS_SCROLLWHEEL;
+               break;
+ 
++      case MODEL_ARTPAD_II:
+       case MODEL_DIGITIZER_II:
+               wacom->dev->name = "Wacom Digitizer II";
+               wacom->dev->id.version = MODEL_DIGITIZER_II;

diff --git a/queue-3.18/iscsi_ibft-fix-missing-break-in-switch-statement.patch b/queue-3.18/iscsi_ibft-fix-missing-break-in-switch-statement.patch
new file mode 100644 (file)
index 0000000..e7c420a
--- /dev/null
+++ b/queue-3.18/iscsi_ibft-fix-missing-break-in-switch-statement.patch
@@ -0,0 +1,35 @@
+From df997abeebadaa4824271009e2d2b526a70a11cb Mon Sep 17 00:00:00 2001
+From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
+Date: Mon, 11 Feb 2019 12:43:23 -0600
+Subject: iscsi_ibft: Fix missing break in switch statement
+
+From: Gustavo A. R. Silva <gustavo@embeddedor.com>
+
+commit df997abeebadaa4824271009e2d2b526a70a11cb upstream.
+
+Add missing break statement in order to prevent the code from falling
+through to case ISCSI_BOOT_TGT_NAME, which is unnecessary.
+
+This bug was found thanks to the ongoing efforts to enable
+-Wimplicit-fallthrough.
+
+Fixes: b33a84a38477 ("ibft: convert iscsi_ibft module to iscsi boot lib")
+Cc: stable@vger.kernel.org
+Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
+Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/firmware/iscsi_ibft.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/firmware/iscsi_ibft.c
++++ b/drivers/firmware/iscsi_ibft.c
+@@ -503,6 +503,7 @@ static umode_t __init ibft_check_tgt_for
+       case ISCSI_BOOT_TGT_NIC_ASSOC:
+       case ISCSI_BOOT_TGT_CHAP_TYPE:
+               rc = S_IRUGO;
++              break;
+       case ISCSI_BOOT_TGT_NAME:
+               if (tgt->tgt_name_len)
+                       rc = S_IRUGO;

diff --git a/queue-3.18/series b/queue-3.18/series
index b42227833f1b5cc5357343189a1b7f0425f8722c..b49e6b62c1b11f2a4d8c2e873739c575c3721249 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -75,3 +75,5 @@ irqchip-mmp-only-touch-the-pj4-irq-fiq-bits-on-enabl.patch
 dmaengine-dmatest-abort-test-in-case-of-mapping-erro.patch
 s390-qeth-fix-use-after-free-in-error-path.patch
 perf-symbols-filter-out-hidden-symbols-from-labels.patch
+input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch
+iscsi_ibft-fix-missing-break-in-switch-statement.patch