aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-11-26 06:51:56 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-27 13:18:29 +0100
commit590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (patch)
treeb8d0c8571b36a5029c9d3c82d2cb7f5a68986ac4 /target/linux/generic/hack-5.15
parent6640c788feadbdde9ac80a66e6b24802ae021bd5 (diff)
downloadupstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.gz
upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.bz2
upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.zip
kernel: bump 5.15 to 5.15.80
Manually rebase: pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch ath79/patches-5.15/910-unaligned_access_hacks.patch All other patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-5.15')
-rw-r--r--target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
index 34a741b1c7..eb11d9b700 100644
--- a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
@@ -20,8 +20,8 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
{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 */
@@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
#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) },