From 1ac8417985252aae7baf5fce962710ae3a1d848c Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 17 Jul 2021 00:05:32 +0800 Subject: [PATCH] kernel: bump to 4.9.275, 4.14.239, 4.19.197 Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++++++------ .../910-unaligned_access_hacks.patch | 2 +- .../950-add-boardinfo-platform-data.patch | 6 +++--- .../patches-4.9/910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 2 +- ...2835-Load-driver-early-and-support-lega.patch | 2 +- .../950-0039-Add-dwc_otg-driver.patch | 2 +- ...-0042-dmaengine-Add-support-for-BCM2708.patch | 4 ++-- ...evice-quirks-for-Freeway-Airmouse-T3-an.patch | 4 ++-- ...75-arch-arm-Add-model-string-to-cpuinfo.patch | 4 ++-- ...5.1-sch_cake-Make-the-dual-modes-fairer.patch | 12 ++++++------ ...mit-use-of-connmarks-as-tin-classifiers.patch | 4 ++-- ...Interpret-fwmark-parameter-as-a-bitmask.patch | 10 +++++----- ...e-drop-unused-variable-tin_quantum_prio.patch | 16 ++++++++-------- ...missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch | 2 +- .../090-net-generalize-napi_complete_done.patch | 2 +- .../generic/hack-4.14/207-disable-modorder.patch | 4 ++-- .../generic/hack-4.14/220-gc_sections.patch | 2 +- .../generic/hack-4.14/902-debloat_proc.patch | 2 +- .../generic/hack-4.19/204-module_strip.patch | 4 ++-- .../generic/hack-4.19/207-disable-modorder.patch | 4 ++-- .../generic/hack-4.19/220-gc_sections.patch | 2 +- .../generic/hack-4.19/221-module_exports.patch | 2 +- ...IP-protocol-handling-in-the-presence-of.patch | 2 +- .../generic/hack-4.19/902-debloat_proc.patch | 2 +- .../generic/hack-4.9/207-disable-modorder.patch | 4 ++-- .../710-phy-add-mdio_register_board_info.patch | 6 +++--- .../generic/hack-4.9/902-debloat_proc.patch | 2 +- .../pending-4.14/630-packet_socket_type.patch | 4 ++-- .../pending-4.19/630-packet_socket_type.patch | 4 ++-- .../pending-4.9/630-packet_socket_type.patch | 4 ++-- .../0002-dmaengine-Add-ADM-driver.patch | 2 +- .../0002-dmaengine-Add-ADM-driver.patch | 2 +- .../802-dma-support-layerscape.patch | 6 +++--- .../807-usb-support-layerscape.patch | 4 ++-- .../816-pcie-support-layerscape.patch | 6 +++--- ...iatek-Add-MediaTek-High-Speed-DMA-contr.patch | 2 +- .../patches-4.14/105-mt7621-memory-detect.patch | 2 +- .../700-net-mdiobus-add-unlocked-accessors.patch | 10 +++++----- 40 files changed, 85 insertions(+), 85 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index fc215f2ab45..f778cb2b2a7 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .272 -LINUX_VERSION-4.14 = .236 -LINUX_VERSION-4.19 = .194 +LINUX_VERSION-4.9 = .275 +LINUX_VERSION-4.14 = .239 +LINUX_VERSION-4.19 = .197 -LINUX_KERNEL_HASH-4.9.272 = f8bf0c390ae40ca736e104f10f744446bc534bf87ba1b6dbb2b7c9a8bece1058 -LINUX_KERNEL_HASH-4.14.236 = e4eae297a6fefefd8ce4781d98178a7c1ee51ca0a4c8a7e46e61b121fbab8b2a -LINUX_KERNEL_HASH-4.19.194 = aaaebdccf599f77148fe170642fa7dc2452cf994b5cbbb4d39cab9e7f4058896 +LINUX_KERNEL_HASH-4.9.275 = 6651728a295b13ca6266f2b6ed55065302a2117785e5a6f80bb64c587f3dbf22 +LINUX_KERNEL_HASH-4.14.239 = a0e7163e24675524d16b8077c055e4946bb16c0fe7cb0eaa20fbc7f846e5ff98 +LINUX_KERNEL_HASH-4.19.197 = e601259beb5184a189db3f8871c97fad9a3bdaceb9cc62e8cdc64f8505217282 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/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index d6510521125..921b98394c4 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -325,7 +325,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look +@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch index edeac838d90..6b0d3000233 100644 --- a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch +++ b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch @@ -26,7 +26,7 @@ #endif /* __MDIO_BOARD_INFO_H */ --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c -@@ -455,6 +455,17 @@ void mdiobus_free(struct mii_bus *bus) +@@ -456,6 +456,17 @@ void mdiobus_free(struct mii_bus *bus) } EXPORT_SYMBOL(mdiobus_free); @@ -44,7 +44,7 @@ /** * mdiobus_scan - scan a bus for MDIO devices. * @bus: mii_bus to scan -@@ -470,6 +481,7 @@ EXPORT_SYMBOL(mdiobus_free); +@@ -471,6 +482,7 @@ EXPORT_SYMBOL(mdiobus_free); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) { struct phy_device *phydev; @@ -52,7 +52,7 @@ int err; phydev = get_phy_device(bus, addr, false); -@@ -482,6 +494,12 @@ struct phy_device *mdiobus_scan(struct m +@@ -483,6 +495,12 @@ struct phy_device *mdiobus_scan(struct m */ of_mdiobus_link_mdiodev(bus, &phydev->mdio); diff --git a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch index 50784466842..a90dec2a987 100644 --- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch @@ -316,7 +316,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -460,7 +460,7 @@ static struct neighbour *ipv4_neigh_look +@@ -461,7 +461,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index a82b6cc55b0..c92cd10fc28 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -316,7 +316,7 @@ for (p = *head; p; p = p->next) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look +@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index c9fb135e5f8..f7a8be35e5d 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -316,7 +316,7 @@ list_for_each_entry(p, head, list) { --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -450,7 +450,7 @@ static struct neighbour *ipv4_neigh_look +@@ -451,7 +451,7 @@ static struct neighbour *ipv4_neigh_look else if (skb) pkey = &ip_hdr(skb)->daddr; diff --git a/target/linux/bcm27xx/patches-4.19/950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/bcm27xx/patches-4.19/950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch index 05bc4a0f4dd..41b8124b0e3 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0013-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch @@ -20,7 +20,7 @@ Signed-off-by: Noralf Trønnes --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -131,7 +131,7 @@ config COH901318 +@@ -132,7 +132,7 @@ config COH901318 config DMA_BCM2835 tristate "BCM2835 DMA engine support" diff --git a/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch index 092522a971e..2d71dcd34ea 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch @@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408 } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5247,7 +5247,7 @@ static void port_event(struct usb_hub *h +@@ -5249,7 +5249,7 @@ static void port_event(struct usb_hub *h u16 status = 0, unused; port_dev->over_current_count++; diff --git a/target/linux/bcm27xx/patches-4.19/950-0042-dmaengine-Add-support-for-BCM2708.patch b/target/linux/bcm27xx/patches-4.19/950-0042-dmaengine-Add-support-for-BCM2708.patch index 46bcb45e011..9ae3249fc39 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0042-dmaengine-Add-support-for-BCM2708.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0042-dmaengine-Add-support-for-BCM2708.patch @@ -178,7 +178,7 @@ Signed-off-by: Andrei Gherzan --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -131,7 +131,7 @@ config COH901318 +@@ -132,7 +132,7 @@ config COH901318 config DMA_BCM2835 tristate "BCM2835 DMA engine support" @@ -187,7 +187,7 @@ Signed-off-by: Andrei Gherzan select DMA_ENGINE select DMA_VIRTUAL_CHANNELS -@@ -576,6 +576,10 @@ config TIMB_DMA +@@ -577,6 +577,10 @@ config TIMB_DMA help Enable support for the Timberdale FPGA DMA engine. diff --git a/target/linux/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch b/target/linux/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch index dfe21aa2f7a..16a651ee3d7 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0636-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0636-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 -@@ -1223,6 +1226,9 @@ +@@ -1224,6 +1227,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 }, -@@ -186,6 +187,7 @@ static const struct hid_device_id hid_qu +@@ -187,6 +188,7 @@ static const struct hid_device_id hid_qu { HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD2, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, diff --git a/target/linux/bcm27xx/patches-4.19/950-0675-arch-arm-Add-model-string-to-cpuinfo.patch b/target/linux/bcm27xx/patches-4.19/950-0675-arch-arm-Add-model-string-to-cpuinfo.patch index cd33961de1f..10efd2084e8 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0675-arch-arm-Add-model-string-to-cpuinfo.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0675-arch-arm-Add-model-string-to-cpuinfo.patch @@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c -@@ -1238,6 +1238,8 @@ static int c_show(struct seq_file *m, vo +@@ -1240,6 +1240,8 @@ static int c_show(struct seq_file *m, vo { int i, j; u32 cpuid; @@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell for_each_online_cpu(i) { /* -@@ -1297,6 +1299,14 @@ static int c_show(struct seq_file *m, vo +@@ -1299,6 +1301,14 @@ static int c_show(struct seq_file *m, vo seq_printf(m, "Revision\t: %04x\n", system_rev); seq_printf(m, "Serial\t\t: %s\n", system_serial); diff --git a/target/linux/generic/backport-4.19/390-v5.1-sch_cake-Make-the-dual-modes-fairer.patch b/target/linux/generic/backport-4.19/390-v5.1-sch_cake-Make-the-dual-modes-fairer.patch index 0454565747e..f560143248a 100644 --- a/target/linux/generic/backport-4.19/390-v5.1-sch_cake-Make-the-dual-modes-fairer.patch +++ b/target/linux/generic/backport-4.19/390-v5.1-sch_cake-Make-the-dual-modes-fairer.patch @@ -83,7 +83,7 @@ Signed-off-by: Kevin Darbyshire-Bryant q->flows[reduced_hash].dsthost = dsthost_idx; } } -@@ -1817,20 +1821,30 @@ static s32 cake_enqueue(struct sk_buff * +@@ -1821,20 +1825,30 @@ static s32 cake_enqueue(struct sk_buff * b->sparse_flow_count++; if (cake_dsrc(q->flow_mode)) @@ -116,7 +116,7 @@ Signed-off-by: Kevin Darbyshire-Bryant } if (q->buffer_used > q->buffer_max_used) -@@ -1998,23 +2012,8 @@ retry: +@@ -2002,23 +2016,8 @@ retry: dsthost = &b->hosts[flow->dsthost]; host_load = 1; @@ -140,7 +140,7 @@ Signed-off-by: Kevin Darbyshire-Bryant /* Keep all flows with deficits out of the sparse and decaying * rotations. No non-empty flow can go into the decaying * rotation, so they can't get deficits -@@ -2023,6 +2022,13 @@ retry: +@@ -2027,6 +2026,13 @@ retry: if (flow->head) { b->sparse_flow_count--; b->bulk_flow_count++; @@ -154,7 +154,7 @@ Signed-off-by: Kevin Darbyshire-Bryant flow->set = CAKE_SET_BULK; } else { /* we've moved it to the bulk rotation for -@@ -2032,6 +2038,22 @@ retry: +@@ -2036,6 +2042,22 @@ retry: flow->set = CAKE_SET_SPARSE_WAIT; } } @@ -177,7 +177,7 @@ Signed-off-by: Kevin Darbyshire-Bryant goto retry; } -@@ -2052,6 +2074,13 @@ retry: +@@ -2056,6 +2078,13 @@ retry: &b->decaying_flows); if (flow->set == CAKE_SET_BULK) { b->bulk_flow_count--; @@ -191,7 +191,7 @@ Signed-off-by: Kevin Darbyshire-Bryant b->decaying_flow_count++; } else if (flow->set == CAKE_SET_SPARSE || flow->set == CAKE_SET_SPARSE_WAIT) { -@@ -2065,14 +2094,19 @@ retry: +@@ -2069,14 +2098,19 @@ retry: if (flow->set == CAKE_SET_SPARSE || flow->set == CAKE_SET_SPARSE_WAIT) b->sparse_flow_count--; diff --git a/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch b/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch index 638a2b45296..f7a668714e6 100644 --- a/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch +++ b/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch @@ -91,7 +91,7 @@ Signed-off-by: David S. Miller }; /* COBALT operates the Codel and BLUE algorithms in parallel, in order to -@@ -2647,6 +2648,13 @@ static int cake_change(struct Qdisc *sch +@@ -2651,6 +2652,13 @@ static int cake_change(struct Qdisc *sch q->rate_flags &= ~CAKE_FLAG_SPLIT_GSO; } @@ -105,7 +105,7 @@ Signed-off-by: David S. Miller if (q->tins) { sch_tree_lock(sch); cake_reconfigure(sch); -@@ -2806,6 +2814,10 @@ static int cake_dump(struct Qdisc *sch, +@@ -2810,6 +2818,10 @@ static int cake_dump(struct Qdisc *sch, !!(q->rate_flags & CAKE_FLAG_SPLIT_GSO))) goto nla_put_failure; diff --git a/target/linux/generic/backport-4.19/392-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patch b/target/linux/generic/backport-4.19/392-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patch index 6ba0897b34e..fa9563c7a54 100644 --- a/target/linux/generic/backport-4.19/392-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patch +++ b/target/linux/generic/backport-4.19/392-v5.1-sch_cake-Interpret-fwmark-parameter-as-a-bitmask.patch @@ -52,7 +52,7 @@ Signed-off-by: Kevin Darbyshire-Bryant }; /* COBALT operates the Codel and BLUE algorithms in parallel, in order to -@@ -1573,7 +1575,7 @@ static struct cake_tin_data *cake_select +@@ -1577,7 +1579,7 @@ static struct cake_tin_data *cake_select struct sk_buff *skb) { struct cake_sched_data *q = qdisc_priv(sch); @@ -61,7 +61,7 @@ Signed-off-by: Kevin Darbyshire-Bryant bool wash; u8 dscp; -@@ -1584,6 +1586,7 @@ static struct cake_tin_data *cake_select +@@ -1588,6 +1590,7 @@ static struct cake_tin_data *cake_select wash = !!(q->rate_flags & CAKE_FLAG_WASH); if (wash) dscp = cake_handle_diffserv(skb, wash); @@ -69,7 +69,7 @@ Signed-off-by: Kevin Darbyshire-Bryant if (q->tin_mode == CAKE_DIFFSERV_BESTEFFORT) tin = 0; -@@ -2202,6 +2205,7 @@ static const struct nla_policy cake_poli +@@ -2206,6 +2209,7 @@ static const struct nla_policy cake_poli [TCA_CAKE_MPU] = { .type = NLA_U32 }, [TCA_CAKE_INGRESS] = { .type = NLA_U32 }, [TCA_CAKE_ACK_FILTER] = { .type = NLA_U32 }, @@ -77,7 +77,7 @@ Signed-off-by: Kevin Darbyshire-Bryant }; static void cake_set_rate(struct cake_tin_data *b, u64 rate, u32 mtu, -@@ -2649,10 +2653,8 @@ static int cake_change(struct Qdisc *sch +@@ -2653,10 +2657,8 @@ static int cake_change(struct Qdisc *sch } if (tb[TCA_CAKE_FWMARK]) { @@ -90,7 +90,7 @@ Signed-off-by: Kevin Darbyshire-Bryant } if (q->tins) { -@@ -2814,8 +2816,7 @@ static int cake_dump(struct Qdisc *sch, +@@ -2818,8 +2820,7 @@ static int cake_dump(struct Qdisc *sch, !!(q->rate_flags & CAKE_FLAG_SPLIT_GSO))) goto nla_put_failure; diff --git a/target/linux/generic/backport-4.19/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch b/target/linux/generic/backport-4.19/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch index 023844f5e67..516f7514771 100644 --- a/target/linux/generic/backport-4.19/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch +++ b/target/linux/generic/backport-4.19/393-v5.5-sch_cake-drop-unused-variable-tin_quantum_prio.patch @@ -32,7 +32,7 @@ Signed-off-by: David S. Miller s32 tin_deficit; u32 tin_backlog; u32 tin_dropped; -@@ -1940,7 +1939,7 @@ begin: +@@ -1944,7 +1943,7 @@ begin: while (b->tin_deficit < 0 || !(b->sparse_flow_count + b->bulk_flow_count)) { if (b->tin_deficit <= 0) @@ -41,7 +41,7 @@ Signed-off-by: David S. Miller if (b->sparse_flow_count + b->bulk_flow_count) empty = false; -@@ -2261,8 +2260,7 @@ static int cake_config_besteffort(struct +@@ -2265,8 +2264,7 @@ static int cake_config_besteffort(struct cake_set_rate(b, rate, mtu, us_to_ns(q->target), us_to_ns(q->interval)); @@ -51,7 +51,7 @@ Signed-off-by: David S. Miller return 0; } -@@ -2273,8 +2271,7 @@ static int cake_config_precedence(struct +@@ -2277,8 +2275,7 @@ static int cake_config_precedence(struct struct cake_sched_data *q = qdisc_priv(sch); u32 mtu = psched_mtu(qdisc_dev(sch)); u64 rate = q->rate_bps; @@ -61,7 +61,7 @@ Signed-off-by: David S. Miller u32 i; q->tin_cnt = 8; -@@ -2287,18 +2284,14 @@ static int cake_config_precedence(struct +@@ -2291,18 +2288,14 @@ static int cake_config_precedence(struct cake_set_rate(b, rate, mtu, us_to_ns(q->target), us_to_ns(q->interval)); @@ -83,7 +83,7 @@ Signed-off-by: David S. Miller } return 0; -@@ -2367,8 +2360,7 @@ static int cake_config_diffserv8(struct +@@ -2371,8 +2364,7 @@ static int cake_config_diffserv8(struct struct cake_sched_data *q = qdisc_priv(sch); u32 mtu = psched_mtu(qdisc_dev(sch)); u64 rate = q->rate_bps; @@ -93,7 +93,7 @@ Signed-off-by: David S. Miller u32 i; q->tin_cnt = 8; -@@ -2384,18 +2376,14 @@ static int cake_config_diffserv8(struct +@@ -2388,18 +2380,14 @@ static int cake_config_diffserv8(struct cake_set_rate(b, rate, mtu, us_to_ns(q->target), us_to_ns(q->interval)); @@ -115,7 +115,7 @@ Signed-off-by: David S. Miller } return 0; -@@ -2434,17 +2422,11 @@ static int cake_config_diffserv4(struct +@@ -2438,17 +2426,11 @@ static int cake_config_diffserv4(struct cake_set_rate(&q->tins[3], rate >> 2, mtu, us_to_ns(q->target), us_to_ns(q->interval)); @@ -137,7 +137,7 @@ Signed-off-by: David S. Miller return 0; } -@@ -2475,15 +2457,10 @@ static int cake_config_diffserv3(struct +@@ -2479,15 +2461,10 @@ static int cake_config_diffserv3(struct cake_set_rate(&q->tins[2], rate >> 2, mtu, us_to_ns(q->target), us_to_ns(q->interval)); diff --git a/target/linux/generic/backport-4.19/394-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch b/target/linux/generic/backport-4.19/394-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch index bc063dcccab..6925cc3c3bf 100644 --- a/target/linux/generic/backport-4.19/394-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch +++ b/target/linux/generic/backport-4.19/394-v5.4-sch_cake-Add-missing-NLA-policy-entry-TCA_CAKE_SPLIT.patch @@ -20,7 +20,7 @@ Signed-off-by: Kevin Darbyshire-Bryant --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c -@@ -2204,6 +2204,7 @@ static const struct nla_policy cake_poli +@@ -2208,6 +2208,7 @@ static const struct nla_policy cake_poli [TCA_CAKE_MPU] = { .type = NLA_U32 }, [TCA_CAKE_INGRESS] = { .type = NLA_U32 }, [TCA_CAKE_ACK_FILTER] = { .type = NLA_U32 }, diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index b694c7e910e..edf9af7be8c 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -960,7 +960,7 @@ Signed-off-by: David S. Miller pasemi_mac_restart_tx_intr(mac); --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c -@@ -2386,7 +2386,7 @@ static int netxen_nic_poll(struct napi_s +@@ -2388,7 +2388,7 @@ static int netxen_nic_poll(struct napi_s work_done = budget; if (work_done < budget) { diff --git a/target/linux/generic/hack-4.14/207-disable-modorder.patch b/target/linux/generic/hack-4.14/207-disable-modorder.patch index 8ac07d23777..0cfb4d33eca 100644 --- a/target/linux/generic/hack-4.14/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.14/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -1261,7 +1261,6 @@ endif +@@ -1260,7 +1260,6 @@ endif PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1290,7 +1289,6 @@ _modinst_: +@@ -1289,7 +1288,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.14/220-gc_sections.patch b/target/linux/generic/hack-4.14/220-gc_sections.patch index fc60001ce42..c91c25dab18 100644 --- a/target/linux/generic/hack-4.14/220-gc_sections.patch +++ b/target/linux/generic/hack-4.14/220-gc_sections.patch @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -@@ -786,11 +791,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH +@@ -785,11 +790,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) endif diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch index b426b07573c..8d024024985 100644 --- a/target/linux/generic/hack-4.14/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch @@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -427,6 +427,9 @@ static struct pernet_operations ip_rt_pr +@@ -428,6 +428,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/hack-4.19/204-module_strip.patch b/target/linux/generic/hack-4.19/204-module_strip.patch index 056a9b44db5..0f3c63677c0 100644 --- a/target/linux/generic/hack-4.19/204-module_strip.patch +++ b/target/linux/generic/hack-4.19/204-module_strip.patch @@ -114,7 +114,7 @@ Signed-off-by: Felix Fietkau config MODULES_TREE_LOOKUP --- a/kernel/module.c +++ b/kernel/module.c -@@ -3090,9 +3090,11 @@ static int setup_load_info(struct load_i +@@ -3099,9 +3099,11 @@ static int setup_load_info(struct load_i static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -3113,6 +3115,7 @@ static int check_modinfo(struct module * +@@ -3122,6 +3124,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } diff --git a/target/linux/generic/hack-4.19/207-disable-modorder.patch b/target/linux/generic/hack-4.19/207-disable-modorder.patch index 6b18407f415..0b8b35d9f2d 100644 --- a/target/linux/generic/hack-4.19/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.19/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -1257,7 +1257,6 @@ endif +@@ -1256,7 +1256,6 @@ endif PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost -@@ -1286,7 +1285,6 @@ _modinst_: +@@ -1285,7 +1284,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.19/220-gc_sections.patch b/target/linux/generic/hack-4.19/220-gc_sections.patch index 0bd84965faa..ef057ef5f72 100644 --- a/target/linux/generic/hack-4.19/220-gc_sections.patch +++ b/target/linux/generic/hack-4.19/220-gc_sections.patch @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -@@ -795,11 +800,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH +@@ -794,11 +799,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) endif diff --git a/target/linux/generic/hack-4.19/221-module_exports.patch b/target/linux/generic/hack-4.19/221-module_exports.patch index b8ecbc101ef..005615351ad 100644 --- a/target/linux/generic/hack-4.19/221-module_exports.patch +++ b/target/linux/generic/hack-4.19/221-module_exports.patch @@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau } \ \ /* __*init sections */ \ -@@ -863,6 +873,8 @@ +@@ -864,6 +874,8 @@ EXIT_TEXT \ EXIT_DATA \ EXIT_CALL \ diff --git a/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch b/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch index c962b710681..790434428c1 100644 --- a/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch +++ b/target/linux/generic/hack-4.19/641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch @@ -103,7 +103,7 @@ Signed-off-by: Kevin Darbyshire-Bryant return false; if (!nf_ct_get_tuple_skb(&tuple, skb)) -@@ -1557,7 +1603,7 @@ static u8 cake_handle_diffserv(struct sk +@@ -1561,7 +1607,7 @@ static u8 cake_handle_diffserv(struct sk u16 *buf, buf_; u8 dscp; diff --git a/target/linux/generic/hack-4.19/902-debloat_proc.patch b/target/linux/generic/hack-4.19/902-debloat_proc.patch index 732948c3ca6..0c37303d049 100644 --- a/target/linux/generic/hack-4.19/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.19/902-debloat_proc.patch @@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau } --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -412,6 +412,9 @@ static struct pernet_operations ip_rt_pr +@@ -413,6 +413,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/hack-4.9/207-disable-modorder.patch b/target/linux/generic/hack-4.9/207-disable-modorder.patch index 680985a1d38..5d7dbf1f062 100644 --- a/target/linux/generic/hack-4.9/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.9/207-disable-modorder.patch @@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -1249,7 +1249,6 @@ endif +@@ -1248,7 +1248,6 @@ endif PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild -@@ -1279,7 +1278,6 @@ _modinst_: +@@ -1278,7 +1277,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi diff --git a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch index a4c15fc36f9..ec1fb74ed54 100644 --- a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch +++ b/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch @@ -9,7 +9,7 @@ /** * mdiobus_alloc_size - allocate a mii_bus structure * @size: extra amount of memory to allocate for private storage. -@@ -400,6 +402,17 @@ void mdiobus_free(struct mii_bus *bus) +@@ -401,6 +403,17 @@ void mdiobus_free(struct mii_bus *bus) } EXPORT_SYMBOL(mdiobus_free); @@ -27,7 +27,7 @@ /** * mdiobus_scan - scan a bus for MDIO devices. * @bus: mii_bus to scan -@@ -415,6 +428,7 @@ EXPORT_SYMBOL(mdiobus_free); +@@ -416,6 +429,7 @@ EXPORT_SYMBOL(mdiobus_free); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr) { struct phy_device *phydev; @@ -35,7 +35,7 @@ int err; phydev = get_phy_device(bus, addr, false); -@@ -427,6 +441,12 @@ struct phy_device *mdiobus_scan(struct m +@@ -428,6 +442,12 @@ struct phy_device *mdiobus_scan(struct m */ of_mdiobus_link_mdiodev(bus, &phydev->mdio); diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index 0996b88fe6e..834cdb0984b 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -394,7 +394,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -422,6 +422,9 @@ static struct pernet_operations ip_rt_pr +@@ -423,6 +423,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) { diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch index e9b40b18c62..fa02d3f7065 100644 --- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.14/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3947,6 +3950,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3949,6 +3952,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3999,6 +4012,13 @@ static int packet_getsockopt(struct sock +@@ -4001,6 +4014,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-4.19/630-packet_socket_type.patch b/target/linux/generic/pending-4.19/630-packet_socket_type.patch index ea536b49a6a..986565c04a1 100644 --- a/target/linux/generic/pending-4.19/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.19/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3909,6 +3912,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3911,6 +3914,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3961,6 +3974,13 @@ static int packet_getsockopt(struct sock +@@ -3963,6 +3976,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/pending-4.9/630-packet_socket_type.patch b/target/linux/generic/pending-4.9/630-packet_socket_type.patch index 158c6101c6e..f7ed5f9a6a0 100644 --- a/target/linux/generic/pending-4.9/630-packet_socket_type.patch +++ b/target/linux/generic/pending-4.9/630-packet_socket_type.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3927,6 +3930,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3929,6 +3932,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3979,6 +3992,13 @@ static int packet_getsockopt(struct sock +@@ -3981,6 +3994,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch b/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch index fedb8ed7982..aa7d2e791ea 100644 --- a/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch +++ b/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch @@ -26,7 +26,7 @@ Signed-off-by: Thomas Pedersen --- a/drivers/dma/qcom/Kconfig +++ b/drivers/dma/qcom/Kconfig -@@ -27,3 +27,13 @@ config QCOM_HIDMA +@@ -28,3 +28,13 @@ config QCOM_HIDMA (user to kernel, kernel to kernel, etc.). It only supports memcpy interface. The core is not intended for general purpose slave DMA. diff --git a/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch b/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch index fedb8ed7982..aa7d2e791ea 100644 --- a/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch +++ b/target/linux/ipq806x/patches-4.19/0002-dmaengine-Add-ADM-driver.patch @@ -26,7 +26,7 @@ Signed-off-by: Thomas Pedersen --- a/drivers/dma/qcom/Kconfig +++ b/drivers/dma/qcom/Kconfig -@@ -27,3 +27,13 @@ config QCOM_HIDMA +@@ -28,3 +28,13 @@ config QCOM_HIDMA (user to kernel, kernel to kernel, etc.). It only supports memcpy interface. The core is not intended for general purpose slave DMA. diff --git a/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch b/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch index 0b75847281a..23f5ac4035c 100644 --- a/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch @@ -47,7 +47,7 @@ Signed-off-by: Yuan Yao --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -129,6 +129,24 @@ config COH901318 +@@ -130,6 +130,24 @@ config COH901318 help Enable support for ST-Ericsson COH 901 318 DMA. @@ -72,7 +72,7 @@ Signed-off-by: Yuan Yao config DMA_BCM2835 tristate "BCM2835 DMA engine support" depends on ARCH_BCM2835 -@@ -215,6 +233,20 @@ config FSL_EDMA +@@ -216,6 +234,20 @@ config FSL_EDMA multiplexing capability for DMA request sources(slot). This module can be found on Freescale Vybrid and LS-1 SoCs. @@ -93,7 +93,7 @@ Signed-off-by: Yuan Yao config FSL_RAID tristate "Freescale RAID engine Support" depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH -@@ -600,7 +632,6 @@ config ZX_DMA +@@ -601,7 +633,6 @@ config ZX_DMA help Support the DMA engine for ZTE ZX family platform devices. diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 4ea197ed666..270cd93998d 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -508,7 +508,7 @@ Signed-off-by: Zhao Chenhui --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c -@@ -391,7 +391,7 @@ static int dwc3_ep0_handle_u1(struct dwc +@@ -394,7 +394,7 @@ static int dwc3_ep0_handle_u1(struct dwc return -EINVAL; reg = dwc3_readl(dwc->regs, DWC3_DCTL); @@ -517,7 +517,7 @@ Signed-off-by: Zhao Chenhui reg |= DWC3_DCTL_INITU1ENA; else reg &= ~DWC3_DCTL_INITU1ENA; -@@ -413,7 +413,7 @@ static int dwc3_ep0_handle_u2(struct dwc +@@ -416,7 +416,7 @@ static int dwc3_ep0_handle_u2(struct dwc return -EINVAL; reg = dwc3_readl(dwc->regs, DWC3_DCTL); diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index e7c42d8d9b1..38a308e9d41 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -5604,9 +5604,9 @@ Signed-off-by: Yangbo Lu * them, we have to fall back to INTx or other interrupts, e.g., a --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3408,6 +3408,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset); - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset); +@@ -3430,6 +3430,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A + */ + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, 0xb005, quirk_no_bus_reset); +/* + * NXP (Freescale Vendor ID) LS1088 chips do not behave correctly after diff --git a/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch b/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch index 6fd4cdef488..7398229502b 100644 --- a/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch +++ b/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch @@ -29,7 +29,7 @@ Cc: Julia Lawall --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig -@@ -604,6 +604,8 @@ config ZX_DMA +@@ -605,6 +605,8 @@ config ZX_DMA # driver files source "drivers/dma/bestcomm/Kconfig" diff --git a/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch b/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch index 22296126794..b19b57fd669 100644 --- a/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch +++ b/target/linux/ramips/patches-4.14/105-mt7621-memory-detect.patch @@ -114,7 +114,7 @@ Signed-off-by: Chuanhong Guo --- a/arch/mips/ralink/of.c +++ b/arch/mips/ralink/of.c -@@ -91,6 +91,8 @@ void __init plat_mem_setup(void) +@@ -89,6 +89,8 @@ void __init plat_mem_setup(void) of_scan_flat_dt(early_init_dt_find_memory, NULL); if (memory_dtb) of_scan_flat_dt(early_init_dt_scan_memory, NULL); diff --git a/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch b/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch index 4880c49b136..c777a0fffee 100644 --- a/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch +++ b/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c -@@ -493,6 +493,55 @@ struct phy_device *mdiobus_scan(struct m +@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m EXPORT_SYMBOL(mdiobus_scan); /** @@ -75,7 +75,7 @@ Signed-off-by: David S. Miller * mdiobus_read_nested - Nested version of the mdiobus_read function * @bus: the mii_bus struct * @addr: the phy address -@@ -512,11 +561,9 @@ int mdiobus_read_nested(struct mii_bus * +@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus * BUG_ON(in_interrupt()); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); @@ -88,7 +88,7 @@ Signed-off-by: David S. Miller return retval; } EXPORT_SYMBOL(mdiobus_read_nested); -@@ -538,11 +585,9 @@ int mdiobus_read(struct mii_bus *bus, in +@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock); @@ -101,7 +101,7 @@ Signed-off-by: David S. Miller return retval; } EXPORT_SYMBOL(mdiobus_read); -@@ -568,11 +613,9 @@ int mdiobus_write_nested(struct mii_bus +@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus BUG_ON(in_interrupt()); mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED); @@ -114,7 +114,7 @@ Signed-off-by: David S. Miller return err; } EXPORT_SYMBOL(mdiobus_write_nested); -@@ -595,11 +638,9 @@ int mdiobus_write(struct mii_bus *bus, i +@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i BUG_ON(in_interrupt()); mutex_lock(&bus->mdio_lock);