From: Greg Kroah-Hartman Date: Mon, 11 Mar 2019 22:13:31 +0000 (-0700) Subject: 4.14-stable patches X-Git-Tag: v5.0.2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfdb51a4b04a96e828353a04d875fd480151db6e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch iscsi_ibft-fix-missing-break-in-switch-statement.patch scsi-aacraid-fix-missing-break-in-switch-statement.patch --- diff --git a/queue-4.14/input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch b/queue-4.14/input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch new file mode 100644 index 00000000000..886953900a6 --- /dev/null +++ b/queue-4.14/input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch @@ -0,0 +1,30 @@ +From e154ab69321ce2c54f19863d75c77b4e2dc9d365 Mon Sep 17 00:00:00 2001 +From: Vincent Batts +Date: Sat, 9 Mar 2019 15:48:04 -0800 +Subject: Input: elan_i2c - add id for touchpad found in Lenovo s21e-20 + +From: Vincent Batts + +commit e154ab69321ce2c54f19863d75c77b4e2dc9d365 upstream. + +Lenovo s21e-20 uses ELAN0601 in its ACPI tables for the Elan touchpad. + +Signed-off-by: Vincent Batts +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/elan_i2c_core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/input/mouse/elan_i2c_core.c ++++ b/drivers/input/mouse/elan_i2c_core.c +@@ -1252,6 +1252,7 @@ static const struct acpi_device_id elan_ + { "ELAN0000", 0 }, + { "ELAN0100", 0 }, + { "ELAN0600", 0 }, ++ { "ELAN0601", 0 }, + { "ELAN0602", 0 }, + { "ELAN0605", 0 }, + { "ELAN0608", 0 }, diff --git a/queue-4.14/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch b/queue-4.14/input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch new file mode 100644 index 00000000000..9c9f8fa60b6 --- /dev/null +++ b/queue-4.14/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 +Date: Sat, 9 Mar 2019 15:32:13 -0800 +Subject: Input: wacom_serial4 - add support for Wacom ArtPad II tablet + +From: Jason Gerecke + +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 +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + 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-4.14/iscsi_ibft-fix-missing-break-in-switch-statement.patch b/queue-4.14/iscsi_ibft-fix-missing-break-in-switch-statement.patch new file mode 100644 index 00000000000..e58ae8f2a69 --- /dev/null +++ b/queue-4.14/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" +Date: Mon, 11 Feb 2019 12:43:23 -0600 +Subject: iscsi_ibft: Fix missing break in switch statement + +From: Gustavo A. R. Silva + +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 +Signed-off-by: Konrad Rzeszutek Wilk +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/firmware/iscsi_ibft.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/firmware/iscsi_ibft.c ++++ b/drivers/firmware/iscsi_ibft.c +@@ -542,6 +542,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-4.14/scsi-aacraid-fix-missing-break-in-switch-statement.patch b/queue-4.14/scsi-aacraid-fix-missing-break-in-switch-statement.patch new file mode 100644 index 00000000000..835ff3edd10 --- /dev/null +++ b/queue-4.14/scsi-aacraid-fix-missing-break-in-switch-statement.patch @@ -0,0 +1,38 @@ +From 5e420fe635813e5746b296cfc8fff4853ae205a2 Mon Sep 17 00:00:00 2001 +From: "Gustavo A. R. Silva" +Date: Fri, 15 Feb 2019 15:42:42 -0600 +Subject: scsi: aacraid: Fix missing break in switch statement + +From: Gustavo A. R. Silva + +commit 5e420fe635813e5746b296cfc8fff4853ae205a2 upstream. + +Add missing break statement and fix identation issue. + +This bug was found thanks to the ongoing efforts to enable +-Wimplicit-fallthrough. + +Fixes: 9cb62fa24e0d ("aacraid: Log firmware AIF messages") +Cc: stable@vger.kernel.org +Signed-off-by: Gustavo A. R. Silva +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/aacraid/commsup.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/scsi/aacraid/commsup.c ++++ b/drivers/scsi/aacraid/commsup.c +@@ -1332,8 +1332,9 @@ static void aac_handle_aif(struct aac_de + ADD : DELETE; + break; + } +- case AifBuManagerEvent: +- aac_handle_aif_bu(dev, aifcmd); ++ break; ++ case AifBuManagerEvent: ++ aac_handle_aif_bu(dev, aifcmd); + break; + } + diff --git a/queue-4.14/series b/queue-4.14/series index cf25841e556..c18fbdf01b5 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -117,3 +117,7 @@ i2c-omap-use-noirq-system-sleep-pm-ops-to-idle-devic.patch fs-ratelimit-__find_get_block_slow-failure-message.patch qed-fix-eq-full-firmware-assert.patch qed-consider-tx-tcs-while-deriving-the-max-num_queue.patch +input-wacom_serial4-add-support-for-wacom-artpad-ii-tablet.patch +input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch +iscsi_ibft-fix-missing-break-in-switch-statement.patch +scsi-aacraid-fix-missing-break-in-switch-statement.patch