aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-03 14:46:59 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-06 00:25:25 +0200
commit752cd29904c9304125005b34354b75b968bfc449 (patch)
treed3ae84605ec5662eb77b49e7886971c61c0dfb48 /target/linux/layerscape
parentda77b9c2f185db72a2917aa2e18f0c8bb164d3c4 (diff)
downloadupstream-752cd29904c9304125005b34354b75b968bfc449.tar.gz
upstream-752cd29904c9304125005b34354b75b968bfc449.tar.bz2
upstream-752cd29904c9304125005b34354b75b968bfc449.zip
kernel: bump 5.4 to 5.4.124
Manually rebased: generic/hack-5.4/662-remove_pfifo_fast.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [manual changes to ramips/patches-5.10/835-asoc-add-mt7620-support.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0029-sdk_dpaa-update-the-xmit-timestamp-to-avoid-watchdog.patch2
-rw-r--r--target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0029-sdk_dpaa-update-the-xmit-timestamp-to-avoid-watchdog.patch b/target/linux/layerscape/patches-5.4/701-net-0029-sdk_dpaa-update-the-xmit-timestamp-to-avoid-watchdog.patch
index 7f925f8946..044e7013a0 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0029-sdk_dpaa-update-the-xmit-timestamp-to-avoid-watchdog.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0029-sdk_dpaa-update-the-xmit-timestamp-to-avoid-watchdog.patch
@@ -59,7 +59,7 @@ Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
*/
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
-@@ -440,6 +440,13 @@ static void dev_watchdog(struct timer_li
+@@ -465,6 +465,13 @@ static void dev_watchdog(struct timer_li
txq->trans_timeout++;
break;
}
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
index 9d3f2ecfda..e3d18a9948 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch
@@ -54,7 +54,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
* All 3.1 IP version constants are greater than the 3.0 IP
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
-@@ -3574,6 +3574,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
+@@ -3575,6 +3575,10 @@ int dwc3_gadget_init(struct dwc3 *dwc)
dwc->gadget.sg_supported = true;
dwc->gadget.name = "dwc3-gadget";
dwc->gadget.lpm_capable = true;