4.4-stable patches

added patches:
	input-i8042-add-bytespeed-touchpad-to-noloop-table.patch
	input-xpad-support-ardwiino-controllers.patch
	powerpc-stop-exporting-__clear_user-which-is-now-inlined.patch

diff --git a/queue-4.4/input-i8042-add-bytespeed-touchpad-to-noloop-table.patch b/queue-4.4/input-i8042-add-bytespeed-touchpad-to-noloop-table.patch
new file mode 100644 (file)
index 0000000..186eec4
--- /dev/null
+++ b/queue-4.4/input-i8042-add-bytespeed-touchpad-to-noloop-table.patch
@@ -0,0 +1,38 @@
+From a48491c65b513e5cdc3e7a886a4db915f848a5f5 Mon Sep 17 00:00:00 2001
+From: Po-Hsu Lin <po-hsu.lin@canonical.com>
+Date: Mon, 30 Nov 2020 22:39:40 -0800
+Subject: Input: i8042 - add ByteSpeed touchpad to noloop table
+
+From: Po-Hsu Lin <po-hsu.lin@canonical.com>
+
+commit a48491c65b513e5cdc3e7a886a4db915f848a5f5 upstream.
+
+It looks like the C15B laptop got another vendor: ByteSpeed LLC.
+
+Avoid AUX loopback on this touchpad as well, thus input subsystem will
+be able to recognize a Synaptics touchpad in the AUX port.
+
+BugLink: https://bugs.launchpad.net/bugs/1906128
+Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
+Link: https://lore.kernel.org/r/20201201054723.5939-1-po-hsu.lin@canonical.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/serio/i8042-x86ia64io.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/input/serio/i8042-x86ia64io.h
++++ b/drivers/input/serio/i8042-x86ia64io.h
+@@ -223,6 +223,10 @@ static const struct dmi_system_id __init
+                       DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "C15B"),
+               },
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"),
++                      DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"),
++              },
+       },
+       { }
+ };

diff --git a/queue-4.4/input-xpad-support-ardwiino-controllers.patch b/queue-4.4/input-xpad-support-ardwiino-controllers.patch
new file mode 100644 (file)
index 0000000..bb9550a
--- /dev/null
+++ b/queue-4.4/input-xpad-support-ardwiino-controllers.patch
@@ -0,0 +1,39 @@
+From 2aab1561439032be2e98811dd0ddbeb5b2ae4c61 Mon Sep 17 00:00:00 2001
+From: Sanjay Govind <sanjay.govind9@gmail.com>
+Date: Mon, 30 Nov 2020 23:41:48 -0800
+Subject: Input: xpad - support Ardwiino Controllers
+
+From: Sanjay Govind <sanjay.govind9@gmail.com>
+
+commit 2aab1561439032be2e98811dd0ddbeb5b2ae4c61 upstream.
+
+This commit adds support for Ardwiino Controllers
+
+Signed-off-by: Sanjay Govind <sanjay.govind9@gmail.com>
+Link: https://lore.kernel.org/r/20201201071922.131666-1-sanjay.govind9@gmail.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/joystick/xpad.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/input/joystick/xpad.c
++++ b/drivers/input/joystick/xpad.c
+@@ -258,6 +258,7 @@ static const struct xpad_device {
+       { 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },
+       { 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },
+       { 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 },
++      { 0x1209, 0x2882, "Ardwiino Controller", 0, XTYPE_XBOX360 },
+       { 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
+       { 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 },
+       { 0x12ab, 0x0303, "Mortal Kombat Klassic FightStick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
+@@ -435,6 +436,7 @@ static const struct usb_device_id xpad_t
+       XPAD_XBOXONE_VENDOR(0x0f0d),            /* Hori Controllers */
+       XPAD_XBOX360_VENDOR(0x1038),            /* SteelSeries Controllers */
+       XPAD_XBOX360_VENDOR(0x11c9),            /* Nacon GC100XF */
++      XPAD_XBOX360_VENDOR(0x1209),            /* Ardwiino Controllers */
+       XPAD_XBOX360_VENDOR(0x12ab),            /* X-Box 360 dance pads */
+       XPAD_XBOX360_VENDOR(0x1430),            /* RedOctane X-Box 360 controllers */
+       XPAD_XBOX360_VENDOR(0x146b),            /* BigBen Interactive Controllers */

diff --git a/queue-4.4/powerpc-stop-exporting-__clear_user-which-is-now-inlined.patch b/queue-4.4/powerpc-stop-exporting-__clear_user-which-is-now-inlined.patch
new file mode 100644 (file)
index 0000000..b87749b
--- /dev/null
+++ b/queue-4.4/powerpc-stop-exporting-__clear_user-which-is-now-inlined.patch
@@ -0,0 +1,32 @@
+From msuchanek@suse.de  Sun Dec  6 10:49:43 2020
+From: Michal Suchanek <msuchanek@suse.de>
+Date: Sat,  5 Dec 2020 00:28:07 +0100
+Subject: powerpc: Stop exporting __clear_user which is now inlined.
+To: stable@vger.kernel.org
+Cc: Michal Suchanek <msuchanek@suse.de>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
+Message-ID: <20201204232807.31887-1-msuchanek@suse.de>
+
+From: Michal Suchanek <msuchanek@suse.de>
+
+Stable commit 452e2a83ea23 ("powerpc: Fix __clear_user() with KUAP
+enabled") redefines __clear_user as inline function but does not remove
+the export.
+
+Fixes: 452e2a83ea23 ("powerpc: Fix __clear_user() with KUAP enabled")
+
+Signed-off-by: Michal Suchanek <msuchanek@suse.de>
+Acked-by: Michael Ellerman <mpe@ellerman.id.au>
+---
+ arch/powerpc/lib/ppc_ksyms.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/arch/powerpc/lib/ppc_ksyms.c
++++ b/arch/powerpc/lib/ppc_ksyms.c
+@@ -24,7 +24,6 @@ EXPORT_SYMBOL(csum_tcpudp_magic);
+ #endif
+ 
+ EXPORT_SYMBOL(__copy_tofrom_user);
+-EXPORT_SYMBOL(__clear_user);
+ EXPORT_SYMBOL(copy_page);
+ 
+ #ifdef CONFIG_PPC64

diff --git a/queue-4.4/series b/queue-4.4/series
index 73998f29b9de575b7f16ce41b26dc299c4110f12..5df8e8d5bf02f193e71d21dc88854d6cfa022e2a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -7,3 +7,6 @@ net-x25-prevent-a-couple-of-overflows.patch
 cxgb3-fix-error-return-code-in-t3_sge_alloc_qset.patch
 net-pasemi-fix-error-return-code-in-pasemi_mac_open.patch
 dt-bindings-net-correct-interrupt-flags-in-examples.patch
+input-xpad-support-ardwiino-controllers.patch
+input-i8042-add-bytespeed-touchpad-to-noloop-table.patch
+powerpc-stop-exporting-__clear_user-which-is-now-inlined.patch