[openwrt/openwrt] kernel: bump 5.10 to 5.10.159

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 14 14:38:01 PST 2022


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/90120a1552ba5e55c4a03aca1920831116ab50a9

commit 90120a1552ba5e55c4a03aca1920831116ab50a9
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Wed Dec 14 10:13:21 2022 -0500

    kernel: bump 5.10 to 5.10.159
    
    Removed upstreamed:
            backport-5.10/888-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch[1]
    
    All patches automatically rebased.
    
    1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.159&id=0a8e66e375736ea12c11f0ef238ba2a8efec460b
    
    Build system: x86_64
    Build-tested: ramips/tplink_archer-a6-v3
    Run-tested: ramips/tplink_archer-a6-v3
    
    Signed-off-by: John Audia <therealgraysky at proton.me>
---
 include/kernel-5.10                                |  4 +--
 ...pass-the-dst-buffer-to-of_get_mac_address.patch |  2 +-
 ...-t-set-skb-offload_fwd_mark-when-not-offl.patch |  6 ++---
 ...a8210-Fix-crash-by-zero-initializing-data.patch | 30 ----------------------
 ...e-USB-host-by-default-on-rk3399-rock-pi-4.patch |  2 +-
 5 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/include/kernel-5.10 b/include/kernel-5.10
index b7179b8567..bd40dc0f40 100644
--- a/include/kernel-5.10
+++ b/include/kernel-5.10
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.10 = .158
-LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
+LINUX_VERSION-5.10 = .159
+LINUX_KERNEL_HASH-5.10.159 = 1ba9bf57b6bf36d76447d5044b80b746cb5fd61d981c811603dc763b7789cea7
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 83aae57d28..928e1ca0dc 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
@@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
  		mdio = of_find_node_by_phandle(*ph);
 --- a/drivers/net/ethernet/aeroflex/greth.c
 +++ b/drivers/net/ethernet/aeroflex/greth.c
-@@ -1449,10 +1449,10 @@ static int greth_of_probe(struct platfor
+@@ -1450,10 +1450,10 @@ static int greth_of_probe(struct platfor
  			break;
  	}
  	if (i == 6) {
diff --git a/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch b/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
index ab4fdf8509..51f87904ef 100644
--- a/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
+++ b/target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
@@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
  	memmove(skb->data - ETH_HLEN,
 --- a/net/dsa/tag_ksz.c
 +++ b/net/dsa/tag_ksz.c
-@@ -24,7 +24,7 @@ static struct sk_buff *ksz_common_rcv(st
- 
- 	pskb_trim_rcsum(skb, skb->len - len);
+@@ -25,7 +25,7 @@ static struct sk_buff *ksz_common_rcv(st
+ 	if (pskb_trim_rcsum(skb, skb->len - len))
+ 		return NULL;
  
 -	skb->offload_fwd_mark = true;
 +	dsa_default_offload_fwd_mark(skb);
diff --git a/target/linux/generic/backport-5.10/888-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch b/target/linux/generic/backport-5.10/888-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch
deleted file mode 100644
index 3f14988d9a..0000000000
--- a/target/linux/generic/backport-5.10/888-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1e24c54da257ab93cff5826be8a793b014a5dc9c Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke at hauke-m.de>
-Date: Mon, 21 Nov 2022 01:22:01 +0100
-Subject: ca8210: Fix crash by zero initializing data
-
-The struct cas_control embeds multiple generic SPI structures and we
-have to make sure these structures are initialized to default values.
-This driver does not set all attributes. When using kmalloc before some
-attributes were not initialized and contained random data which caused
-random crashes at bootup.
-
-Fixes: ded845a781a5 ("ieee802154: Add CA8210 IEEE 802.15.4 device driver")
-Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
-Link: https://lore.kernel.org/r/20221121002201.1339636-1-hauke@hauke-m.de
-Signed-off-by: Stefan Schmidt <stefan at datenfreihafen.org>
----
- drivers/net/ieee802154/ca8210.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/ieee802154/ca8210.c
-+++ b/drivers/net/ieee802154/ca8210.c
-@@ -926,7 +926,7 @@ static int ca8210_spi_transfer(
- 
- 	dev_dbg(&spi->dev, "%s called\n", __func__);
- 
--	cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);
-+	cas_ctl = kzalloc(sizeof(*cas_ctl), GFP_ATOMIC);
- 	if (!cas_ctl)
- 		return -ENOMEM;
- 
diff --git a/target/linux/rockchip/patches-5.10/104-rockchip-use-USB-host-by-default-on-rk3399-rock-pi-4.patch b/target/linux/rockchip/patches-5.10/104-rockchip-use-USB-host-by-default-on-rk3399-rock-pi-4.patch
index da87227564..56166783a5 100644
--- a/target/linux/rockchip/patches-5.10/104-rockchip-use-USB-host-by-default-on-rk3399-rock-pi-4.patch
+++ b/target/linux/rockchip/patches-5.10/104-rockchip-use-USB-host-by-default-on-rk3399-rock-pi-4.patch
@@ -21,7 +21,7 @@ Signed-off-by: Heiko Stuebner <heiko at sntech.de>
 
 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
-@@ -680,7 +680,7 @@
+@@ -679,7 +679,7 @@
  
  &usbdrd_dwc3_0 {
  	status = "okay";




More information about the lede-commits mailing list