Drop revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.14/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
deleted file mode 100644 (file)
index c191037..0000000
--- a/queue-4.14/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Mon, 27 Apr 2020 18:06:02 -0700
-Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
-
-This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
-Locke:
-
-"... nomux only appeared to fix the issue because the controller
-continued working after warm reboots. After more thorough testing from
-both warm and cold start, I now believe the entry should be added to
-i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
-alone is sufficient to avoid the issue from both states while
-i8042.nomux is not."
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/input/serio/i8042-x86ia64io.h |    7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -545,13 +545,6 @@ static const struct dmi_system_id __init
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
-               },
-       },
--      {
--              /* Lenovo ThinkPad Twist S230u */
--              .matches = {
--                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--                      DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
--              },
--      },
-       { }
- };
- 

diff --git a/queue-4.19/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.19/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
deleted file mode 100644 (file)
index c191037..0000000
--- a/queue-4.19/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Mon, 27 Apr 2020 18:06:02 -0700
-Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
-
-This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
-Locke:
-
-"... nomux only appeared to fix the issue because the controller
-continued working after warm reboots. After more thorough testing from
-both warm and cold start, I now believe the entry should be added to
-i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
-alone is sufficient to avoid the issue from both states while
-i8042.nomux is not."
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/input/serio/i8042-x86ia64io.h |    7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -545,13 +545,6 @@ static const struct dmi_system_id __init
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
-               },
-       },
--      {
--              /* Lenovo ThinkPad Twist S230u */
--              .matches = {
--                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--                      DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
--              },
--      },
-       { }
- };
- 

diff --git a/queue-4.4/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.4/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
deleted file mode 100644 (file)
index c191037..0000000
--- a/queue-4.4/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Mon, 27 Apr 2020 18:06:02 -0700
-Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
-
-This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
-Locke:
-
-"... nomux only appeared to fix the issue because the controller
-continued working after warm reboots. After more thorough testing from
-both warm and cold start, I now believe the entry should be added to
-i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
-alone is sufficient to avoid the issue from both states while
-i8042.nomux is not."
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/input/serio/i8042-x86ia64io.h |    7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -545,13 +545,6 @@ static const struct dmi_system_id __init
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
-               },
-       },
--      {
--              /* Lenovo ThinkPad Twist S230u */
--              .matches = {
--                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--                      DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
--              },
--      },
-       { }
- };
- 

diff --git a/queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
deleted file mode 100644 (file)
index c191037..0000000
--- a/queue-4.9/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Mon, 27 Apr 2020 18:06:02 -0700
-Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
-
-This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
-Locke:
-
-"... nomux only appeared to fix the issue because the controller
-continued working after warm reboots. After more thorough testing from
-both warm and cold start, I now believe the entry should be added to
-i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
-alone is sufficient to avoid the issue from both states while
-i8042.nomux is not."
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/input/serio/i8042-x86ia64io.h |    7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -545,13 +545,6 @@ static const struct dmi_system_id __init
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
-               },
-       },
--      {
--              /* Lenovo ThinkPad Twist S230u */
--              .matches = {
--                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--                      DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
--              },
--      },
-       { }
- };
- 

diff --git a/queue-5.4/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-5.4/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
deleted file mode 100644 (file)
index cc34e96..0000000
--- a/queue-5.4/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Mon, 27 Apr 2020 18:06:02 -0700
-Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
-
-This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
-Locke:
-
-"... nomux only appeared to fix the issue because the controller
-continued working after warm reboots. After more thorough testing from
-both warm and cold start, I now believe the entry should be added to
-i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
-alone is sufficient to avoid the issue from both states while
-i8042.nomux is not."
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/input/serio/i8042-x86ia64io.h |    7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -541,13 +541,6 @@ static const struct dmi_system_id __init
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
-               },
-       },
--      {
--              /* Lenovo ThinkPad Twist S230u */
--              .matches = {
--                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--                      DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
--              },
--      },
-       { }
- };
- 

diff --git a/queue-5.6/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch b/queue-5.6/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
deleted file mode 100644 (file)
index cc34e96..0000000
--- a/queue-5.6/revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f4dec2d6160976b14e54be9c3950ce0f52385741 Mon Sep 17 00:00:00 2001
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-Date: Mon, 27 Apr 2020 18:06:02 -0700
-Subject: Revert "Input: i8042 - add ThinkPad S230u to i8042 nomux list"
-
-From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-
-commit f4dec2d6160976b14e54be9c3950ce0f52385741 upstream.
-
-This reverts commit 18931506465a762ffd3f4803d36a18d336a67da9. From Kevin
-Locke:
-
-"... nomux only appeared to fix the issue because the controller
-continued working after warm reboots. After more thorough testing from
-both warm and cold start, I now believe the entry should be added to
-i8042_dmi_reset_table rather than i8042_dmi_nomux_table as i8042.reset=1
-alone is sufficient to avoid the issue from both states while
-i8042.nomux is not."
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/input/serio/i8042-x86ia64io.h |    7 -------
- 1 file changed, 7 deletions(-)
-
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -541,13 +541,6 @@ static const struct dmi_system_id __init
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"),
-               },
-       },
--      {
--              /* Lenovo ThinkPad Twist S230u */
--              .matches = {
--                      DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
--                      DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"),
--              },
--      },
-       { }
- };
-