From 0cadba2d40ce0f5908fa504aa3d4280d530891ab Mon Sep 17 00:00:00 2001 From: Boos4721 <43845654+Boos4721@users.noreply.github.com> Date: Thu, 16 Dec 2021 12:55:51 +0800 Subject: [PATCH] kernel: bump 5.10 to 5.10.85 (#8434) Signed-off-by: boos4721 <3.1415926535boos@gmail.com> --- include/kernel-version.mk | 4 +-- ...hci_fixup_endpoint-for-interval-adju.patch | 2 +- ...ce-quirks-for-Freeway-Airmouse-T3-an.patch | 4 +-- .../950-0249-kbuild-Disable-gcc-plugins.patch | 28 ------------------- ...2c-Add-driver-for-Sony-IMX477-sensor.patch | 2 +- ...vicetree-Add-documentation-for-imx37.patch | 2 +- ...und-for-bogus-SET_DEQ_PENDING-endpoi.patch | 2 +- ...ble-Set-offload-timeouts-according-t.patch | 4 +-- .../pending-5.10/834-ledtrig-libata.patch | 8 +++--- .../600-qca-nss-ecm-support-CORE.patch | 14 +++++----- ...5-qca-add-add-nss-bridge-mgr-support.patch | 2 +- .../600-qca-nss-ecm-support-CORE.patch | 10 +++---- .../oxnas/patches-5.10/999-libata-hacks.patch | 4 +-- 13 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 target/linux/bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 63500a696..445f6a7c8 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .162 -LINUX_VERSION-5.10 = .84 +LINUX_VERSION-5.10 = .85 LINUX_KERNEL_HASH-5.4.162 = c12d72ddaac78189305a5e98825295ecb02282970033b052276035e83189e25b -LINUX_KERNEL_HASH-5.10.84 = 6e96271d72dd106c4bd83931ca16fda622413b34c5649e2916116c38c12e233d +LINUX_KERNEL_HASH-5.10.85 = ba89162605ac447db8953c29f649b64d16aff7de8145e2db30d759e5476b19ac remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index dfd6e89b3..6cc748211 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0139-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -119,7 +119,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5366,6 +5463,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5370,6 +5467,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, 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 217b2117d..fa76e0a82 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 #define USB_VENDOR_ID_BELKIN 0x050d #define USB_DEVICE_ID_FLIP_KVM 0x3201 -@@ -1268,6 +1271,9 @@ +@@ -1270,6 +1273,9 @@ #define USB_VENDOR_ID_XAT 0x2505 #define USB_DEVICE_ID_XAT_CSR 0x0220 @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell { 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 }, -@@ -193,6 +194,7 @@ static const struct hid_device_id hid_qu +@@ -194,6 +195,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/bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch b/target/linux/bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch deleted file mode 100644 index f3a0b33a9..000000000 --- a/target/linux/bcm27xx/patches-5.10/950-0249-kbuild-Disable-gcc-plugins.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4c6ffdf90a3a982fa11676faf658eebfd000867b Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Wed, 8 Apr 2020 15:23:56 +0100 -Subject: [PATCH] kbuild: Disable gcc plugins - -The GCC plugin feature leads to different kernel configurations on what -ought to be equivalent build systems because they depend on the build -hosts native compilers rather than the cross compilers needed for the -target. This causes problems with module symbol version mismatches. - -Disable GCC plugins for all build hosts. - -Advanced build script hackery borrowed from a patch by milhouse. - -Signed-off-by: Phil Elwell ---- - scripts/gcc-plugin.sh | 1 + - 1 file changed, 1 insertion(+) - ---- a/scripts/gcc-plugin.sh -+++ b/scripts/gcc-plugin.sh -@@ -1,5 +1,6 @@ - #!/bin/sh - # SPDX-License-Identifier: GPL-2.0 -+exit 1 # Disable plugins - - set -e - diff --git a/target/linux/bcm27xx/patches-5.10/950-0323-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch b/target/linux/bcm27xx/patches-5.10/950-0323-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch index bbfecb7ad..5e8cd9ee6 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0323-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0323-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -16346,6 +16346,14 @@ S: Maintained +@@ -16345,6 +16345,14 @@ S: Maintained T: git git://linuxtv.org/media_tree.git F: drivers/media/i2c/imx355.c diff --git a/target/linux/bcm27xx/patches-5.10/950-0657-Documentation-devicetree-Add-documentation-for-imx37.patch b/target/linux/bcm27xx/patches-5.10/950-0657-Documentation-devicetree-Add-documentation-for-imx37.patch index cd2c028d5..7f2810b40 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0657-Documentation-devicetree-Add-documentation-for-imx37.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0657-Documentation-devicetree-Add-documentation-for-imx37.patch @@ -132,7 +132,7 @@ Signed-off-by: David Plowman +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -16360,6 +16360,7 @@ M: Raspberry Pi Kernel Maintenance --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -4259,9 +4259,9 @@ void xhci_queue_new_dequeue_state(struct +@@ -4258,9 +4258,9 @@ void xhci_queue_new_dequeue_state(struct } ep = &xhci->devs[slot_id]->eps[ep_index]; if ((ep->ep_state & SET_DEQ_PENDING)) { diff --git a/target/linux/generic/backport-5.10/610-v5.13-57-netfilter-flowtable-Set-offload-timeouts-according-t.patch b/target/linux/generic/backport-5.10/610-v5.13-57-netfilter-flowtable-Set-offload-timeouts-according-t.patch index 5410e2751..1e82308ea 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-57-netfilter-flowtable-Set-offload-timeouts-according-t.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-57-netfilter-flowtable-Set-offload-timeouts-according-t.patch @@ -64,8 +64,8 @@ Signed-off-by: Pablo Neira Ayuso return; + } - if (nf_flow_timeout_delta(ct->timeout) > (__s32)timeout) - ct->timeout = nfct_time_stamp + timeout; + if (nf_flow_timeout_delta(READ_ONCE(ct->timeout)) > (__s32)timeout) + WRITE_ONCE(ct->timeout, nfct_time_stamp + timeout); @@ -265,11 +268,35 @@ static const struct rhashtable_params nf .automatic_shrinking = true, }; diff --git a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch index fddec74d9..e43a97bfe 100644 --- a/target/linux/generic/pending-5.10/834-ledtrig-libata.patch +++ b/target/linux/generic/pending-5.10/834-ledtrig-libata.patch @@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @tf: Target ATA taskfile -@@ -4545,6 +4558,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4547,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (tag < 0) return NULL; } @@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle qc = __ata_qc_from_tag(ap, tag); qc->tag = qc->hw_tag = tag; -@@ -5323,6 +5339,9 @@ struct ata_port *ata_port_alloc(struct a +@@ -5325,6 +5341,9 @@ struct ata_port *ata_port_alloc(struct a ap->stats.unhandled_irq = 1; ap->stats.idle_irq = 1; #endif @@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle ata_sff_port_init(ap); return ap; -@@ -5358,6 +5377,12 @@ static void ata_host_release(struct kref +@@ -5360,6 +5379,12 @@ static void ata_host_release(struct kref kfree(ap->pmp_link); kfree(ap->slave_link); @@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle kfree(ap); host->ports[i] = NULL; } -@@ -5764,7 +5789,23 @@ int ata_host_register(struct ata_host *h +@@ -5766,7 +5791,23 @@ int ata_host_register(struct ata_host *h host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->local_port_no = i + 1; } diff --git a/target/linux/ipq60xx/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq60xx/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 26a2016b1..03dee7bd2 100644 --- a/target/linux/ipq60xx/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq60xx/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -25,7 +25,7 @@ connections. */ --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -63,6 +63,7 @@ extern void brioctl_set(int (*ioctl_hook +@@ -64,6 +64,7 @@ extern void brioctl_set(int (*ioctl_hook extern void br_dev_update_stats(struct net_device *dev, struct rtnl_link_stats64 *nlstats); @@ -33,7 +33,7 @@ #if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING) int br_multicast_list_adjacent(struct net_device *dev, -@@ -158,4 +159,41 @@ br_port_flag_is_set(const struct net_dev +@@ -159,4 +160,41 @@ br_port_flag_is_set(const struct net_dev } #endif @@ -489,7 +489,7 @@ #endif --- a/net/core/neighbour.c +++ b/net/core/neighbour.c -@@ -1210,7 +1210,21 @@ static void neigh_update_hhs(struct neig +@@ -1209,7 +1209,21 @@ static void neigh_update_hhs(struct neig } } @@ -511,7 +511,7 @@ /* Generic update routine. -- lladdr is new lladdr or NULL, if it is not supplied. -@@ -1241,6 +1255,7 @@ static int __neigh_update(struct neighbo +@@ -1240,6 +1254,7 @@ static int __neigh_update(struct neighbo int notify = 0; struct net_device *dev; int update_isrouter = 0; @@ -519,7 +519,7 @@ trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid); -@@ -1255,6 +1270,8 @@ static int __neigh_update(struct neighbo +@@ -1254,6 +1269,8 @@ static int __neigh_update(struct neighbo new = old; goto out; } @@ -528,7 +528,7 @@ if (!(flags & NEIGH_UPDATE_F_ADMIN) && (old & (NUD_NOARP | NUD_PERMANENT))) goto out; -@@ -1292,6 +1309,11 @@ static int __neigh_update(struct neighbo +@@ -1291,6 +1308,11 @@ static int __neigh_update(struct neighbo - compare new & old - if they are different, check override flag */ @@ -540,7 +540,7 @@ if ((old & NUD_VALID) && !memcmp(lladdr, neigh->ha, dev->addr_len)) lladdr = neigh->ha; -@@ -1414,8 +1436,11 @@ out: +@@ -1413,8 +1435,11 @@ out: if (((new ^ old) & NUD_PERMANENT) || ext_learn_change) neigh_update_gc_list(neigh); diff --git a/target/linux/ipq60xx/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch b/target/linux/ipq60xx/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch index b194bea21..4d6afb93f 100644 --- a/target/linux/ipq60xx/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch +++ b/target/linux/ipq60xx/patches-5.10/605-qca-add-add-nss-bridge-mgr-support.patch @@ -13,7 +13,7 @@ Signed-off-by: Simon Casey --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h -@@ -196,4 +196,8 @@ typedef struct net_bridge_port *br_get_d +@@ -197,4 +197,8 @@ typedef struct net_bridge_port *br_get_d extern br_get_dst_hook_t __rcu *br_get_dst_hook; /* QCA NSS ECM support - End */ diff --git a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch index 7870884c7..7e31c20d9 100644 --- a/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch +++ b/target/linux/ipq807x/patches-5.10/600-qca-nss-ecm-support-CORE.patch @@ -489,7 +489,7 @@ #endif --- a/net/core/neighbour.c +++ b/net/core/neighbour.c -@@ -1210,7 +1210,21 @@ static void neigh_update_hhs(struct neig +@@ -1209,7 +1209,21 @@ static void neigh_update_hhs(struct neig } } @@ -511,7 +511,7 @@ /* Generic update routine. -- lladdr is new lladdr or NULL, if it is not supplied. -@@ -1241,6 +1255,7 @@ static int __neigh_update(struct neighbo +@@ -1240,6 +1254,7 @@ static int __neigh_update(struct neighbo int notify = 0; struct net_device *dev; int update_isrouter = 0; @@ -519,7 +519,7 @@ trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid); -@@ -1255,6 +1270,8 @@ static int __neigh_update(struct neighbo +@@ -1254,6 +1269,8 @@ static int __neigh_update(struct neighbo new = old; goto out; } @@ -528,7 +528,7 @@ if (!(flags & NEIGH_UPDATE_F_ADMIN) && (old & (NUD_NOARP | NUD_PERMANENT))) goto out; -@@ -1286,6 +1303,11 @@ static int __neigh_update(struct neighbo +@@ -1291,6 +1308,11 @@ static int __neigh_update(struct neighbo - compare new & old - if they are different, check override flag */ @@ -540,7 +540,7 @@ if ((old & NUD_VALID) && !memcmp(lladdr, neigh->ha, dev->addr_len)) lladdr = neigh->ha; -@@ -1408,8 +1430,11 @@ out: +@@ -1413,8 +1435,11 @@ out: if (((new ^ old) & NUD_PERMANENT) || ext_learn_change) neigh_update_gc_list(neigh); diff --git a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch index e34891cbb..61c0c045a 100644 --- a/target/linux/oxnas/patches-5.10/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-5.10/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ qc = __ata_qc_from_tag(ap, ATA_TAG_INTERNAL); -@@ -4552,6 +4560,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4554,6 +4562,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -4597,6 +4608,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4599,6 +4610,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap);