From: Sasha Levin Date: Tue, 2 Jun 2020 02:19:53 +0000 (-0400) Subject: Drop input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch X-Git-Tag: v4.4.226~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35e7835d8f10d9862900644c09300395b9f52172;p=thirdparty%2Fkernel%2Fstable-queue.git Drop input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.14/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch deleted file mode 100644 index 8b80d918aa2..00000000000 --- a/queue-4.14/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From c22549a00f0614ed49b1a7f0d7a7f1e10d111661 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Apr 2020 10:02:19 -0700 -Subject: Input: i8042 - add ThinkPad S230u to i8042 nomux list - -From: Kevin Locke - -[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ] - -On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version -"GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode -the keyboard, Synaptics TouchPad, and TrackPoint either do not function -or stop functioning a few minutes after boot. This problem has been -noted before, perhaps only occurring on BIOS 1.57 and -later.[1][2][3][4][5] - -This model does not have an external PS/2 port, so mux does not appear -to be useful. - -Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago -and although the [BIOS changelog] notes "Fixed an issue of UEFI -touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be -insufficient. - -Adding 33474HU to the nomux list avoids the issue on my system. - -[1]: https://bugs.launchpad.net/bugs/1210748 -[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425 -[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200 -[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115 -[5]: https://forums.lenovo.com/topic/findpost/27/1337119 -[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt - -Signed-off-by: Kevin Locke -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/feb8a8339a67025dab3850e6377eb6f3a0e782ba.1587400635.git.kevin@kevinlocke.name -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index 0d0f977a2f39..8bf38eded1ef 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -545,6 +545,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - }, -+ { -+ /* Lenovo ThinkPad Twist S230u */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), -+ }, -+ }, - { } - }; - --- -2.25.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 84dc75e0d55..cc5b10a2508 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -21,7 +21,6 @@ net-freescale-select-config_fixed_phy-where-needed.patch cifs-fix-null-pointer-check-in-cifs_read.patch samples-bpf-fix-build-error.patch input-usbtouchscreen-add-support-for-bonxeon-tp.patch -input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch input-evdev-call-input_flush_device-on-release-not-f.patch input-xpad-add-custom-init-packet-for-xbox-one-s-con.patch input-dlink-dir685-touchkeys-fix-a-typo-in-driver-na.patch @@ -66,7 +65,6 @@ netfilter-nf_conntrack_pptp-prevent-buffer-overflows-in-debug-code.patch esp6-get-the-right-proto-for-transport-mode-in-esp6_gso_encap.patch qlcnic-fix-missing-release-in-qlcnic_83xx_interrupt_test.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch -revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch mm-vmalloc.c-don-t-dereference-possible-null-pointer-in-__vunmap.patch sc16is7xx-move-label-err_spi-to-correct-section.patch diff --git a/queue-4.19/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.19/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch deleted file mode 100644 index ad9621bcab1..00000000000 --- a/queue-4.19/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 775e655beff957b41051db31179def211cac7523 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Apr 2020 10:02:19 -0700 -Subject: Input: i8042 - add ThinkPad S230u to i8042 nomux list - -From: Kevin Locke - -[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ] - -On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version -"GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode -the keyboard, Synaptics TouchPad, and TrackPoint either do not function -or stop functioning a few minutes after boot. This problem has been -noted before, perhaps only occurring on BIOS 1.57 and -later.[1][2][3][4][5] - -This model does not have an external PS/2 port, so mux does not appear -to be useful. - -Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago -and although the [BIOS changelog] notes "Fixed an issue of UEFI -touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be -insufficient. - -Adding 33474HU to the nomux list avoids the issue on my system. - -[1]: https://bugs.launchpad.net/bugs/1210748 -[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425 -[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200 -[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115 -[5]: https://forums.lenovo.com/topic/findpost/27/1337119 -[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt - -Signed-off-by: Kevin Locke -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/feb8a8339a67025dab3850e6377eb6f3a0e782ba.1587400635.git.kevin@kevinlocke.name -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index 0d0f977a2f39..8bf38eded1ef 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -545,6 +545,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - }, -+ { -+ /* Lenovo ThinkPad Twist S230u */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), -+ }, -+ }, - { } - }; - --- -2.25.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 38987f9f358..e31ae123090 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -34,7 +34,6 @@ riscv-stacktrace-fix-undefined-reference-to-walk_sta.patch cifs-fix-null-pointer-check-in-cifs_read.patch samples-bpf-fix-build-error.patch input-usbtouchscreen-add-support-for-bonxeon-tp.patch -input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch input-evdev-call-input_flush_device-on-release-not-f.patch input-xpad-add-custom-init-packet-for-xbox-one-s-con.patch input-dlink-dir685-touchkeys-fix-a-typo-in-driver-na.patch @@ -89,6 +88,5 @@ xsk-add-overflow-check-for-u64-division-stored-into-u32.patch qlcnic-fix-missing-release-in-qlcnic_83xx_interrupt_test.patch crypto-chelsio-chtls-properly-set-tp-lsndtime.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch -revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch mm-vmalloc.c-don-t-dereference-possible-null-pointer-in-__vunmap.patch diff --git a/queue-4.4/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.4/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch deleted file mode 100644 index fd190fd9f74..00000000000 --- a/queue-4.4/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From ce9dbb27f4296df193c88edc56db979956fb35c1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Apr 2020 10:02:19 -0700 -Subject: Input: i8042 - add ThinkPad S230u to i8042 nomux list - -From: Kevin Locke - -[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ] - -On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version -"GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode -the keyboard, Synaptics TouchPad, and TrackPoint either do not function -or stop functioning a few minutes after boot. This problem has been -noted before, perhaps only occurring on BIOS 1.57 and -later.[1][2][3][4][5] - -This model does not have an external PS/2 port, so mux does not appear -to be useful. - -Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago -and although the [BIOS changelog] notes "Fixed an issue of UEFI -touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be -insufficient. - -Adding 33474HU to the nomux list avoids the issue on my system. - -[1]: https://bugs.launchpad.net/bugs/1210748 -[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425 -[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200 -[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115 -[5]: https://forums.lenovo.com/topic/findpost/27/1337119 -[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt - -Signed-off-by: Kevin Locke -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/feb8a8339a67025dab3850e6377eb6f3a0e782ba.1587400635.git.kevin@kevinlocke.name -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index a4e76084a2af..42330024da2f 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -545,6 +545,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - }, -+ { -+ /* Lenovo ThinkPad Twist S230u */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), -+ }, -+ }, - { } - }; - --- -2.25.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 4478c8e3bea..22982b35d5d 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -10,7 +10,6 @@ cachefiles-fix-race-between-read_waiter-and-read_cop.patch usb-gadget-legacy-fix-redundant-initialization-warni.patch cifs-fix-null-pointer-check-in-cifs_read.patch input-usbtouchscreen-add-support-for-bonxeon-tp.patch -input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch input-evdev-call-input_flush_device-on-release-not-f.patch input-xpad-add-custom-init-packet-for-xbox-one-s-con.patch input-i8042-add-thinkpad-s230u-to-i8042-reset-list.patch @@ -33,7 +32,6 @@ netfilter-ipset-fix-subcounter-update-skip.patch netfilter-nf_conntrack_pptp-prevent-buffer-overflows-in-debug-code.patch qlcnic-fix-missing-release-in-qlcnic_83xx_interrupt_test.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch -revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch mm-remove-vm_bug_on-pageslab-from-page_mapcount.patch drm-fb-helper-use-proper-plane-mask-for-fb-cleanup.patch diff --git a/queue-4.9/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.9/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch deleted file mode 100644 index de406e31b4c..00000000000 --- a/queue-4.9/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 121488cdb86dcb1bbafc354572785f4c2ca31b3d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Apr 2020 10:02:19 -0700 -Subject: Input: i8042 - add ThinkPad S230u to i8042 nomux list - -From: Kevin Locke - -[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ] - -On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version -"GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode -the keyboard, Synaptics TouchPad, and TrackPoint either do not function -or stop functioning a few minutes after boot. This problem has been -noted before, perhaps only occurring on BIOS 1.57 and -later.[1][2][3][4][5] - -This model does not have an external PS/2 port, so mux does not appear -to be useful. - -Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago -and although the [BIOS changelog] notes "Fixed an issue of UEFI -touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be -insufficient. - -Adding 33474HU to the nomux list avoids the issue on my system. - -[1]: https://bugs.launchpad.net/bugs/1210748 -[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425 -[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200 -[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115 -[5]: https://forums.lenovo.com/topic/findpost/27/1337119 -[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt - -Signed-off-by: Kevin Locke -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/feb8a8339a67025dab3850e6377eb6f3a0e782ba.1587400635.git.kevin@kevinlocke.name -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index a4e76084a2af..42330024da2f 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -545,6 +545,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - }, -+ { -+ /* Lenovo ThinkPad Twist S230u */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), -+ }, -+ }, - { } - }; - --- -2.25.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 50d012ede4a..7eb5275534c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -17,7 +17,6 @@ cachefiles-fix-race-between-read_waiter-and-read_cop.patch usb-gadget-legacy-fix-redundant-initialization-warni.patch cifs-fix-null-pointer-check-in-cifs_read.patch input-usbtouchscreen-add-support-for-bonxeon-tp.patch -input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch input-evdev-call-input_flush_device-on-release-not-f.patch input-xpad-add-custom-init-packet-for-xbox-one-s-con.patch input-i8042-add-thinkpad-s230u-to-i8042-reset-list.patch @@ -51,7 +50,6 @@ netfilter-ipset-fix-subcounter-update-skip.patch netfilter-nf_conntrack_pptp-prevent-buffer-overflows-in-debug-code.patch qlcnic-fix-missing-release-in-qlcnic_83xx_interrupt_test.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch -revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch genirq-generic_pending-do-not-lose-pending-affinity-update.patch net-rtnl_configure_link-fix-dev-flags-changes-arg-to-__dev_notify_flags.patch diff --git a/queue-5.4/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-5.4/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch deleted file mode 100644 index 53a3f067a6f..00000000000 --- a/queue-5.4/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 2243e4f1fc4ab6a572a94b2133d86137ee63c68d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Apr 2020 10:02:19 -0700 -Subject: Input: i8042 - add ThinkPad S230u to i8042 nomux list - -From: Kevin Locke - -[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ] - -On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version -"GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode -the keyboard, Synaptics TouchPad, and TrackPoint either do not function -or stop functioning a few minutes after boot. This problem has been -noted before, perhaps only occurring on BIOS 1.57 and -later.[1][2][3][4][5] - -This model does not have an external PS/2 port, so mux does not appear -to be useful. - -Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago -and although the [BIOS changelog] notes "Fixed an issue of UEFI -touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be -insufficient. - -Adding 33474HU to the nomux list avoids the issue on my system. - -[1]: https://bugs.launchpad.net/bugs/1210748 -[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425 -[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200 -[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115 -[5]: https://forums.lenovo.com/topic/findpost/27/1337119 -[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt - -Signed-off-by: Kevin Locke -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/feb8a8339a67025dab3850e6377eb6f3a0e782ba.1587400635.git.kevin@kevinlocke.name -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index 08e919dbeb5d..5bbc9152731d 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -541,6 +541,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - }, -+ { -+ /* Lenovo ThinkPad Twist S230u */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), -+ }, -+ }, - { } - }; - --- -2.25.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 3ba16a5dd2b..8aeec3cca3e 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -60,7 +60,6 @@ csky-fixup-raw_copy_from_user.patch samples-bpf-fix-build-error.patch drivers-net-hamradio-fix-suspicious-rcu-usage-warnin.patch input-usbtouchscreen-add-support-for-bonxeon-tp.patch -input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch input-evdev-call-input_flush_device-on-release-not-f.patch input-xpad-add-custom-init-packet-for-xbox-one-s-con.patch input-dlink-dir685-touchkeys-fix-a-typo-in-driver-na.patch @@ -134,7 +133,6 @@ nexthop-expand-nexthop_is_multipath-in-a-few-places.patch ipv4-nexthop-version-of-fib_info_nh_uses_dev.patch net-dsa-declare-lockless-tx-feature-for-slave-ports.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch -revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch netfilter-conntrack-comparison-of-unsigned-in-cthelper-confirmation.patch netfilter-conntrack-pass-value-of-ctinfo-to-__nf_conntrack_update.patch netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch diff --git a/queue-5.6/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-5.6/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch deleted file mode 100644 index 34773589d44..00000000000 --- a/queue-5.6/input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 69f7eb7cb74c30cd5fab202ebef0e1fbd93448fd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 20 Apr 2020 10:02:19 -0700 -Subject: Input: i8042 - add ThinkPad S230u to i8042 nomux list - -From: Kevin Locke - -[ Upstream commit 18931506465a762ffd3f4803d36a18d336a67da9 ] - -On the Lenovo ThinkPad Twist S230u (3347-4HU) with BIOS version -"GDETC1WW (1.81 ) 06/27/2019", whether booted in UEFI or Legacy/CSM mode -the keyboard, Synaptics TouchPad, and TrackPoint either do not function -or stop functioning a few minutes after boot. This problem has been -noted before, perhaps only occurring on BIOS 1.57 and -later.[1][2][3][4][5] - -This model does not have an external PS/2 port, so mux does not appear -to be useful. - -Odds of a BIOS fix appear to be low: 1.57 was released over 6 years ago -and although the [BIOS changelog] notes "Fixed an issue of UEFI -touchpad/trackpoint/keyboard/touchscreen" in 1.58, it appears to be -insufficient. - -Adding 33474HU to the nomux list avoids the issue on my system. - -[1]: https://bugs.launchpad.net/bugs/1210748 -[2]: https://bbs.archlinux.org/viewtopic.php?pid=1360425 -[3]: https://forums.linuxmint.com/viewtopic.php?f=46&t=41200 -[4]: https://forums.linuxmint.com/viewtopic.php?f=49&t=157115 -[5]: https://forums.lenovo.com/topic/findpost/27/1337119 -[BIOS changelog]: https://download.lenovo.com/pccbbs/mobiles/gduj33uc.txt - -Signed-off-by: Kevin Locke -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/feb8a8339a67025dab3850e6377eb6f3a0e782ba.1587400635.git.kevin@kevinlocke.name -Signed-off-by: Dmitry Torokhov -Signed-off-by: Sasha Levin ---- - drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h -index 08e919dbeb5d..5bbc9152731d 100644 ---- a/drivers/input/serio/i8042-x86ia64io.h -+++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -541,6 +541,13 @@ static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - }, -+ { -+ /* Lenovo ThinkPad Twist S230u */ -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), -+ }, -+ }, - { } - }; - --- -2.25.1 - diff --git a/queue-5.6/series b/queue-5.6/series index 7e1ed051eb8..0a536d7d9e5 100644 --- a/queue-5.6/series +++ b/queue-5.6/series @@ -81,7 +81,6 @@ csky-fixup-raw_copy_from_user.patch samples-bpf-fix-build-error.patch drivers-net-hamradio-fix-suspicious-rcu-usage-warnin.patch input-usbtouchscreen-add-support-for-bonxeon-tp.patch -input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch input-evdev-call-input_flush_device-on-release-not-f.patch input-xpad-add-custom-init-packet-for-xbox-one-s-con.patch input-dlink-dir685-touchkeys-fix-a-typo-in-driver-na.patch @@ -170,7 +169,6 @@ ipv4-nexthop-version-of-fib_info_nh_uses_dev.patch net-dsa-declare-lockless-tx-feature-for-slave-ports.patch bonding-fix-reference-count-leak-in-bond_sysfs_slave_add.patch powerpc-bpf-enable-bpf_probe_read-str-on-powerpc-again.patch -revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch netfilter-conntrack-comparison-of-unsigned-in-cthelper-confirmation.patch netfilter-conntrack-pass-value-of-ctinfo-to-__nf_conntrack_update.patch netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch