diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-10-28 14:07:50 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-11-02 21:09:44 +0100 |
| commit | 85251576c4ba2a1ae0c54d406f6514566aec3d60 (patch) | |
| tree | 65a29facb413507dd29e859c1517cfbba9ca120e /target/linux/generic/hack-5.10 | |
| parent | f3a78afe7f32d32c0d6a913452ddc0a24fa7d246 (diff) | |
| download | upstream-85251576c4ba2a1ae0c54d406f6514566aec3d60.tar.gz upstream-85251576c4ba2a1ae0c54d406f6514566aec3d60.tar.bz2 upstream-85251576c4ba2a1ae0c54d406f6514566aec3d60.zip | |
kernel: bump 5.10 to 5.10.199
All patches automatically rebased.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/hack-5.10')
| -rw-r--r-- | target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.10/902-debloat_proc.patch | 4 |
2 files changed, 4 insertions, 4 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 c9828dc481..dc35d513c0 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 @@ -10,7 +10,7 @@ {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -244,6 +244,8 @@ static void option_instat_callback(struc +@@ -247,6 +247,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 @@ -19,7 +19,7 @@ #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1180,6 +1182,11 @@ static const struct usb_device_id option +@@ -1185,6 +1187,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/hack-5.10/902-debloat_proc.patch b/target/linux/generic/hack-5.10/902-debloat_proc.patch index 486971032a..a7e3d84315 100644 --- a/target/linux/generic/hack-5.10/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch @@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2989,11 +2989,13 @@ static const struct seq_operations fib_r +@@ -2993,11 +2993,13 @@ static const struct seq_operations fib_r int __net_init fib_proc_init(struct net *net) { @@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> fib_triestat_seq_show, NULL)) goto out2; -@@ -3004,17 +3006,21 @@ int __net_init fib_proc_init(struct net +@@ -3008,17 +3010,21 @@ int __net_init fib_proc_init(struct net return 0; out3: |