diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-12 10:32:59 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-08-14 18:24:11 +0200 |
| commit | bc138c5b72305ea977573e30bc8d8a5b32c094f9 (patch) | |
| tree | 8ee98905f65d077a4abd48f9ca5b7dd309d765db /target/linux/mvebu | |
| parent | 46e9a9b04e4f42772cac056453a77937a2b6a40c (diff) | |
| download | upstream-bc138c5b72305ea977573e30bc8d8a5b32c094f9.tar.gz upstream-bc138c5b72305ea977573e30bc8d8a5b32c094f9.tar.bz2 upstream-bc138c5b72305ea977573e30bc8d8a5b32c094f9.zip | |
kernel: bump 4.14 to 4.14.138
Refreshed all patches.
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu')
| -rw-r--r-- | target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch | 2 | ||||
| -rw-r--r-- | target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch index 3fd07d231f..a5efa25838 100644 --- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch +++ b/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch @@ -49,7 +49,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> }; --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -1058,34 +1058,6 @@ int phylink_ethtool_set_pauseparam(struc +@@ -1060,34 +1060,6 @@ int phylink_ethtool_set_pauseparam(struc } EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam); diff --git a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch b/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch index 4db3867c4e..10bd2d0a46 100644 --- a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch +++ b/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch @@ -10,7 +10,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c -@@ -775,8 +775,8 @@ void phylink_start(struct phylink *pl) +@@ -777,8 +777,8 @@ void phylink_start(struct phylink *pl) clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state); phylink_run_resolve(pl); @@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> if (pl->phydev) phy_start(pl->phydev); } -@@ -788,8 +788,8 @@ void phylink_stop(struct phylink *pl) +@@ -790,8 +790,8 @@ void phylink_stop(struct phylink *pl) if (pl->phydev) phy_stop(pl->phydev); |