diff options
| author | John Audia <graysky@archlinux.us> | 2020-09-26 13:30:16 -0400 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2020-09-28 16:23:11 +0200 |
| commit | 283cdb30ab70e01ddeae3bb74a4c719bc460d3e9 (patch) | |
| tree | 2647ec78a10bb1570986d43688f154d8384cefbf /target/linux | |
| parent | a735eabc32d4e7e419c0f052ceb3b0529516595b (diff) | |
| download | upstream-283cdb30ab70e01ddeae3bb74a4c719bc460d3e9.tar.gz upstream-283cdb30ab70e01ddeae3bb74a4c719bc460d3e9.tar.bz2 upstream-283cdb30ab70e01ddeae3bb74a4c719bc460d3e9.zip | |
kernel: bump 5.4 to 5.4.68
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x, ath79/generic, bcm72xx/bcm2711
Run-tested: ipq806x (R7800)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux')
3 files changed, 5 insertions, 5 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 6ee99b4791..ecb70a9904 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 @@ -130,7 +130,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> /* Some Ethernet drivers try to connect to a PHY device before * calling register_netdevice() -> netdev_register_kobject() and * does the dev->dev.kobj initialization. Here we only check for -@@ -2289,6 +2352,9 @@ static int phy_remove(struct device *dev +@@ -2290,6 +2353,9 @@ static int phy_remove(struct device *dev phydev->state = PHY_DOWN; mutex_unlock(&phydev->lock); diff --git a/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch b/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch index f03cd2a984..bb26986c79 100644 --- a/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch +++ b/target/linux/generic/backport-5.4/750-v5.5-net-phy-add-support-for-clause-37-auto-negotiation.patch @@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1681,6 +1681,40 @@ static int genphy_config_advert(struct p +@@ -1682,6 +1682,40 @@ static int genphy_config_advert(struct p } /** @@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> * genphy_config_eee_advert - disable unwanted eee mode advertisement * @phydev: target phy_device struct * -@@ -1789,6 +1823,54 @@ int __genphy_config_aneg(struct phy_devi +@@ -1790,6 +1824,54 @@ int __genphy_config_aneg(struct phy_devi EXPORT_SYMBOL(__genphy_config_aneg); /** @@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> * genphy_aneg_done - return auto-negotiation status * @phydev: target phy_device struct * -@@ -1960,6 +2042,63 @@ int genphy_read_status(struct phy_device +@@ -1961,6 +2043,63 @@ int genphy_read_status(struct phy_device EXPORT_SYMBOL(genphy_read_status); /** diff --git a/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch index 4201dfe7fc..0e292f5b6f 100644 --- a/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/hack-5.4/702-phy_add_aneg_done_function.patch @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1911,6 +1911,9 @@ int genphy_update_link(struct phy_device +@@ -1912,6 +1912,9 @@ int genphy_update_link(struct phy_device if (bmcr & BMCR_ANRESTART) goto done; |