diff options
| author | John Audia <therealgraysky@proton.me> | 2022-11-25 16:10:45 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-27 13:18:29 +0100 |
| commit | acb10faa35748ca3a7e0f559c431a1a752fdc529 (patch) | |
| tree | f94d570520d39fb8cc53247d3da0a80a50143582 /target/linux/generic | |
| parent | 590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (diff) | |
| download | upstream-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')
| -rw-r--r-- | target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index 3c559938fe..80ba4a69c1 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -311,7 +311,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> arc_emac_set_address_internal(ndev); --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c -@@ -1856,7 +1856,6 @@ static int ag71xx_probe(struct platform_ +@@ -1857,7 +1857,6 @@ static int ag71xx_probe(struct platform_ const struct ag71xx_dcfg *dcfg; struct net_device *ndev; struct resource *res; @@ -319,7 +319,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int tx_size, err, i; struct ag71xx *ag; -@@ -1952,10 +1951,8 @@ static int ag71xx_probe(struct platform_ +@@ -1953,10 +1952,8 @@ static int ag71xx_probe(struct platform_ ag->stop_desc->ctrl = 0; ag->stop_desc->next = (u32)ag->stop_desc_dma; 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) }, |