aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-03-17 14:22:56 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-21 22:45:20 +0100
commit2c81b1696400c60fdb4316ae447f789087781359 (patch)
treee758d310d60d3e24db078f3a0f12c5d4150cfe31 /target/linux/generic/backport-5.4
parentabbaf696f6658bbf92895fd8285353c5644fe845 (diff)
downloadupstream-2c81b1696400c60fdb4316ae447f789087781359.tar.gz
upstream-2c81b1696400c60fdb4316ae447f789087781359.tar.bz2
upstream-2c81b1696400c60fdb4316ae447f789087781359.zip
kernel: bump 5.4 to 5.4.106
Ran update_kernel.sh in a fresh clone without any existing toolchains. Manually rebased: bcm27xx/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch layerscape/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch 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> [remove accidental whitespace edit] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/backport-5.4')
-rw-r--r--target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
index ecb70a9904..b9755e8943 100644
--- a/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
+++ b/target/linux/generic/backport-5.4/737-v5.5-net-phy-add-core-phylib-sfp-support.patch
@@ -24,7 +24,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
#include <linux/workqueue.h>
#include <linux/mdio.h>
#include <linux/io.h>
-@@ -842,6 +843,9 @@ void phy_stop(struct phy_device *phydev)
+@@ -843,6 +844,9 @@ void phy_stop(struct phy_device *phydev)
mutex_lock(&phydev->lock);
@@ -34,7 +34,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phydev->state = PHY_HALTED;
mutex_unlock(&phydev->lock);
-@@ -904,6 +908,9 @@ void phy_state_machine(struct work_struc
+@@ -905,6 +909,9 @@ void phy_state_machine(struct work_struc
old_state = phydev->state;