kernel: bump 5.10 to 5.10.159
authorJohn Audia <therealgraysky@proton.me>
Wed, 14 Dec 2022 15:13:21 +0000 (10:13 -0500)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 15 Dec 2022 00:26:25 +0000 (01:26 +0100)
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@proton.me>
(cherry picked from commit 90120a1552ba5e55c4a03aca1920831116ab50a9)

include/kernel-5.10
target/linux/bcm27xx/patches-5.10/950-0115-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch
target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
target/linux/generic/backport-5.10/744-v5.15-net-dsa-don-t-set-skb-offload_fwd_mark-when-not-offl.patch
target/linux/generic/pending-5.10/870-ca8210-Fix-crash-by-zero-initializing-data.patch [deleted file]
target/linux/rockchip/patches-5.10/104-rockchip-use-USB-host-by-default-on-rk3399-rock-pi-4.patch

index b7179b8567e9cdebbce46baccf24319c0a75c686..bd40dc0f40705e1e51080dfb3f8b7dc37cd0372a 100644 (file)
@@ -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
index 4ef794c6c0f3b368dd2d811150b95763f4fa24ea..69cb28eeda9fbbe7a508312d3daa3b267dd0329e 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 --- a/drivers/media/common/videobuf2/videobuf2-core.c
 +++ b/drivers/media/common/videobuf2/videobuf2-core.c
-@@ -2140,12 +2140,12 @@ static int __find_plane_by_offset(struct
+@@ -2191,12 +2191,12 @@ static int __find_plane_by_offset(struct
        return -EINVAL;
  }
  
@@ -35,7 +35,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        struct dma_buf *dbuf;
  
        if (q->memory != VB2_MEMORY_MMAP) {
-@@ -2195,6 +2195,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
+@@ -2246,6 +2246,21 @@ int vb2_core_expbuf(struct vb2_queue *q,
                return -EINVAL;
        }
  
index 46492ee42528df2b83780af5c5d1a866be09e246..2a518defbeef66ed4ddc664b28e74349bf0df41c 100644 (file)
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  
-@@ -1274,6 +1277,9 @@
+@@ -1276,6 +1279,9 @@
  #define USB_VENDOR_ID_XAT     0x2505
  #define USB_DEVICE_ID_XAT_CSR 0x0220
  
@@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
-@@ -195,6 +196,7 @@ static const struct hid_device_id hid_qu
+@@ -198,6 +199,7 @@ static const struct hid_device_id hid_qu
        { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
index 83aae57d280c7d009931e88ae584984f84c57d46..928e1ca0dca1148ae9f81faf18b6f639d567c733 100644 (file)
@@ -222,7 +222,7 @@ Signed-off-by: David S. Miller <davem@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) {
index ab4fdf85093a90a27f24cd154695e79c49df37d0..51f87904ef18d1a252c723ac75f1248979dd4600 100644 (file)
@@ -82,9 +82,9 @@ Signed-off-by: David S. Miller <davem@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/pending-5.10/870-ca8210-Fix-crash-by-zero-initializing-data.patch b/target/linux/generic/pending-5.10/870-ca8210-Fix-crash-by-zero-initializing-data.patch
deleted file mode 100644 (file)
index 3f14988..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1e24c54da257ab93cff5826be8a793b014a5dc9c Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@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@hauke-m.de>
-Link: https://lore.kernel.org/r/20221121002201.1339636-1-hauke@hauke-m.de
-Signed-off-by: Stefan Schmidt <stefan@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;
index da87227564dfedddf768d1e2d405a7834d2fc77f..56166783a5815aab4f4b1b6e9c4112d8c598bc10 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Heiko Stuebner <heiko@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";