aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-12-21 14:19:12 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-12-24 15:24:18 +0100
commit59254010077c9086afee8a8b4c490943d6749065 (patch)
tree75d5b5e5ff6f545a5dd654070698f07f6f4a1424
parent0c405bceba11574b3d11c5612adfe5f70e2817fd (diff)
downloadupstream-59254010077c9086afee8a8b4c490943d6749065.tar.gz
upstream-59254010077c9086afee8a8b4c490943d6749065.tar.bz2
upstream-59254010077c9086afee8a8b4c490943d6749065.zip
kernel: bump 5.10 to 5.10.161
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
-rw-r--r--include/kernel-5.104
-rw-r--r--target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch2
-rw-r--r--target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/kernel-5.10 b/include/kernel-5.10
index abfb0422d1..da007fc72d 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .160
-LINUX_KERNEL_HASH-5.10.160 = 30d5076acae863941045880c4c5c5109d26a54a932168fa1324237e8aeaa840b
+LINUX_VERSION-5.10 = .161
+LINUX_KERNEL_HASH-5.10.161 = 7aaaf6d0bcd8a2cfa14ad75f02ca62bb2de08aad3bee3eff198de49ea5254079
diff --git a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
index 4ca2946481..00ca3fbade 100644
--- a/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
+++ b/target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch
@@ -13,7 +13,7 @@ produce a noisy warning.
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
-@@ -274,6 +274,7 @@ static void xhci_pci_quirks(struct devic
+@@ -276,6 +276,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x0015) {
xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci->quirks |= XHCI_ZERO_64B_REGS;
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 8718aedfa3..6d499b88fe 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
@@ -33,7 +33,7 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
-@@ -1155,6 +1157,11 @@ static const struct usb_device_id option
+@@ -1156,6 +1158,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },