]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.3-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Nov 2015 22:56:28 +0000 (14:56 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Nov 2015 22:56:28 +0000 (14:56 -0800)
added patches:
arm-8449-1-fix-bug-in-vdsomunge-swab32-macro.patch
usb-qcserial-add-sierra-wireless-mc74xx-em74xx.patch

queue-4.3/arm-8449-1-fix-bug-in-vdsomunge-swab32-macro.patch [new file with mode: 0644]
queue-4.3/series [new file with mode: 0644]
queue-4.3/usb-qcserial-add-sierra-wireless-mc74xx-em74xx.patch [new file with mode: 0644]

diff --git a/queue-4.3/arm-8449-1-fix-bug-in-vdsomunge-swab32-macro.patch b/queue-4.3/arm-8449-1-fix-bug-in-vdsomunge-swab32-macro.patch
new file mode 100644 (file)
index 0000000..75e9e9e
--- /dev/null
@@ -0,0 +1,35 @@
+From 38850d786a799c3ff2de0dc1980902c3263698dc Mon Sep 17 00:00:00 2001
+From: "H. Nikolaus Schaller" <hns@goldelico.com>
+Date: Wed, 28 Oct 2015 19:00:26 +0100
+Subject: ARM: 8449/1: fix bug in vdsomunge swab32 macro
+
+From: "H. Nikolaus Schaller" <hns@goldelico.com>
+
+commit 38850d786a799c3ff2de0dc1980902c3263698dc upstream.
+
+Commit 8a603f91cc48 ("ARM: 8445/1: fix vdsomunge not to depend on
+glibc specific byteswap.h") unfortunately introduced a bug created but
+not found during discussion and patch simplification.
+
+Reported-by: Efraim Yawitz <efraim.yawitz@gmail.com>
+Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
+Fixes: 8a603f91cc48 ("ARM: 8445/1: fix vdsomunge not to depend on glibc specific byteswap.h")
+Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/vdso/vdsomunge.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/vdso/vdsomunge.c
++++ b/arch/arm/vdso/vdsomunge.c
+@@ -66,7 +66,7 @@
+       ((((x) & 0x000000ff) << 24) | \
+        (((x) & 0x0000ff00) <<  8) | \
+        (((x) & 0x00ff0000) >>  8) | \
+-       (((x) & 0xff000000) << 24))
++       (((x) & 0xff000000) >> 24))
+ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+ #define HOST_ORDER ELFDATA2LSB
diff --git a/queue-4.3/series b/queue-4.3/series
new file mode 100644 (file)
index 0000000..fa6a099
--- /dev/null
@@ -0,0 +1,2 @@
+arm-8449-1-fix-bug-in-vdsomunge-swab32-macro.patch
+usb-qcserial-add-sierra-wireless-mc74xx-em74xx.patch
diff --git a/queue-4.3/usb-qcserial-add-sierra-wireless-mc74xx-em74xx.patch b/queue-4.3/usb-qcserial-add-sierra-wireless-mc74xx-em74xx.patch
new file mode 100644 (file)
index 0000000..510a255
--- /dev/null
@@ -0,0 +1,34 @@
+From f504ab1888026d15b5be8f9c262bf4ae9cacd177 Mon Sep 17 00:00:00 2001
+From: Bjørn Mork <bjorn@mork.no>
+Date: Thu, 22 Oct 2015 14:24:24 +0200
+Subject: USB: qcserial: add Sierra Wireless MC74xx/EM74xx
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit f504ab1888026d15b5be8f9c262bf4ae9cacd177 upstream.
+
+New device IDs shamelessly lifted from the vendor driver.
+
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Acked-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/serial/qcserial.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/serial/qcserial.c
++++ b/drivers/usb/serial/qcserial.c
+@@ -153,6 +153,8 @@ static const struct usb_device_id id_tab
+       {DEVICE_SWI(0x1199, 0x9056)},   /* Sierra Wireless Modem */
+       {DEVICE_SWI(0x1199, 0x9060)},   /* Sierra Wireless Modem */
+       {DEVICE_SWI(0x1199, 0x9061)},   /* Sierra Wireless Modem */
++      {DEVICE_SWI(0x1199, 0x9070)},   /* Sierra Wireless MC74xx/EM74xx */
++      {DEVICE_SWI(0x1199, 0x9071)},   /* Sierra Wireless MC74xx/EM74xx */
+       {DEVICE_SWI(0x413c, 0x81a2)},   /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
+       {DEVICE_SWI(0x413c, 0x81a3)},   /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
+       {DEVICE_SWI(0x413c, 0x81a4)},   /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */