diff options
author | John Audia <therealgraysky@proton.me> | 2022-12-14 10:13:21 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-12-15 01:26:25 +0100 |
commit | d909fb1d3b0ac391d1ff871aa6f72e0e4ee8852b (patch) | |
tree | 0fa8fcba0921514544b2d5a701e9c4dc70344c20 /target | |
parent | e5cec69484274ab6161d90397e065d17c7cbd406 (diff) | |
download | upstream-d909fb1d3b0ac391d1ff871aa6f72e0e4ee8852b.tar.gz upstream-d909fb1d3b0ac391d1ff871aa6f72e0e4ee8852b.tar.bz2 upstream-d909fb1d3b0ac391d1ff871aa6f72e0e4ee8852b.zip |
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@proton.me>
(cherry picked from commit 90120a1552ba5e55c4a03aca1920831116ab50a9)
Diffstat (limited to 'target')
6 files changed, 9 insertions, 39 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0115-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch b/target/linux/bcm27xx/patches-5.10/950-0115-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch index 4ef794c6c0..69cb28eeda 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0115-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0115-media-videobuf2-Allow-exporting-of-a-struct-dmabuf.patch @@ -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; } diff --git a/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index 46492ee425..2a518defbe 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0151-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch @@ -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 }, 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@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@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 index 3f14988d9a..0000000000 --- a/target/linux/generic/pending-5.10/870-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@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; - 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@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"; |