aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-11-25 16:10:45 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-27 13:18:29 +0100
commitacb10faa35748ca3a7e0f559c431a1a752fdc529 (patch)
treef94d570520d39fb8cc53247d3da0a80a50143582 /target/linux/generic/hack-5.10
parent590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (diff)
downloadupstream-acb10faa35748ca3a7e0f559c431a1a752fdc529.tar.gz
upstream-acb10faa35748ca3a7e0f559c431a1a752fdc529.tar.bz2
upstream-acb10faa35748ca3a7e0f559c431a1a752fdc529.zip
kernel: bump 5.10 to 5.10.156
Manually rebased: ath79/patches-5.10/910-unaligned_access_hacks.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
index 36fc383dc1..8718aedfa3 100644
--- a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
@@ -24,8 +24,8 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
-@@ -243,6 +243,8 @@ static void option_instat_callback(struc
- #define UBLOX_PRODUCT_R6XX 0x90fa
+@@ -244,6 +244,8 @@ static void option_instat_callback(struc
+ #define UBLOX_PRODUCT_R410M 0x90b2
/* These Yuga products use Qualcomm's vendor ID */
#define YUGA_PRODUCT_CLM920_NC5 0x9625
+/* These MeigLink products use Qualcomm's vendor ID */
@@ -33,7 +33,7 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
-@@ -1143,6 +1145,11 @@ static const struct usb_device_id option
+@@ -1155,6 +1157,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },