ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-19 05:38:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

kernel: bump 5.10 to 5.10.156

Browse Source 
Manually rebased: ath79/patches-5.10/910-unaligned_access_hacks.patch

All other patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2022-11-25 16:10:45 -05:00 committed by Hauke Mehrtens
parent 590aa0ca51
commit acb10faa35
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-5.10
View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .155 LINUX_VERSION-5.10 = .156
LINUX_KERNEL_HASH-5.10.155 = f1b027526c58e7bd127f35b17736e4a6c865866b9048898f05c5358d4d52d4f3 LINUX_KERNEL_HASH-5.10.156 = 679e9964ca720027967391b61db990ceb7868e93e203f87724f18310f4955923

14
target/linux/ath79/patches-5.10/910-unaligned_access_hacks.patch
View File

@ -162,9 +162,9 @@ SVN-Revision: 35130
--- a/include/uapi/linux/ip.h --- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h
@@ -103,7 +103,7 @@ struct iphdr { @@ -105,7 +105,7 @@ struct iphdr {
__be32 saddr; __be32 daddr;
__be32 daddr; );
/*The options start here. */ /*The options start here. */
-}; -};
+} __attribute__((packed, aligned(2))); +} __attribute__((packed, aligned(2)));
@ -173,10 +173,10 @@ SVN-Revision: 35130
struct ip_auth_hdr { struct ip_auth_hdr {
--- a/include/uapi/linux/ipv6.h --- a/include/uapi/linux/ipv6.h
+++ b/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h
@@ -132,7 +132,7 @@ struct ipv6hdr { @@ -134,7 +134,7 @@ struct ipv6hdr {
struct in6_addr saddr;
struct in6_addr saddr; struct in6_addr daddr;
struct in6_addr daddr; );
-}; -};
+} __attribute__((packed, aligned(2))); +} __attribute__((packed, aligned(2)));

4
target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
View File

@ -311,7 +311,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
arc_emac_set_address_internal(ndev); arc_emac_set_address_internal(ndev);
--- a/drivers/net/ethernet/atheros/ag71xx.c --- a/drivers/net/ethernet/atheros/ag71xx.c
+++ b/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; const struct ag71xx_dcfg *dcfg;
struct net_device *ndev; struct net_device *ndev;
struct resource *res; struct resource *res;
@ -319,7 +319,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int tx_size, err, i; int tx_size, err, i;
struct ag71xx *ag; 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->ctrl = 0;
ag->stop_desc->next = (u32)ag->stop_desc_dma; ag->stop_desc->next = (u32)ag->stop_desc_dma;

6
target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch
View File

@ -24,8 +24,8 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
--- a/drivers/usb/serial/option.c --- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c
@@ -243,6 +243,8 @@ static void option_instat_callback(struc @@ -244,6 +244,8 @@ static void option_instat_callback(struc
#define UBLOX_PRODUCT_R6XX 0x90fa #define UBLOX_PRODUCT_R410M 0x90b2
/* These Yuga products use Qualcomm's vendor ID */ /* These Yuga products use Qualcomm's vendor ID */
#define YUGA_PRODUCT_CLM920_NC5 0x9625 #define YUGA_PRODUCT_CLM920_NC5 0x9625
+/* These MeigLink products use Qualcomm's vendor ID */ +/* These MeigLink products use Qualcomm's vendor ID */
@ -33,7 +33,7 @@ Submitted-by: Daniel Golle <daniel@makrotopia.org>
#define QUECTEL_VENDOR_ID 0x2c7c #define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */ /* 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 }, .driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) }, .driver_info = RSVD(4) },

2
target/linux/x86/patches-5.10/101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Lee Jones <lee.jones@linaro.org>
--- a/drivers/mfd/lpc_ich.c --- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c
@@ -489,6 +489,7 @@ static struct lpc_ich_info lpc_chipset_i @@ -491,6 +491,7 @@ static struct lpc_ich_info lpc_chipset_i
[LPC_DH89XXCC] = { [LPC_DH89XXCC] = {
.name = "DH89xxCC", .name = "DH89xxCC",
.iTCO_version = 2, .iTCO_version = 2,