aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-18 15:11:42 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-22 21:16:53 +0200
commitac3b5f00e17de2c7791748f6fa434eb93ee3b66e (patch)
tree81358c66636e1e1662386d9708452a2b6dd8d40e /target/linux/mvebu
parent15a70d085d1bb278a198f4666ab27000980020cc (diff)
downloadupstream-ac3b5f00e17de2c7791748f6fa434eb93ee3b66e.tar.gz
upstream-ac3b5f00e17de2c7791748f6fa434eb93ee3b66e.tar.bz2
upstream-ac3b5f00e17de2c7791748f6fa434eb93ee3b66e.zip
kernel: bump 4.14 to 4.14.112
Refreshed all patches. Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 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.patch4
1 files changed, 2 insertions, 2 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 540ef51ba4..1de8caab8b 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
@@ -159,7 +159,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
#include <linux/slab.h>
#include <linux/rtnetlink.h>
#include <linux/sched/signal.h>
-@@ -2190,6 +2191,9 @@ static int __ethtool_get_module_info(str
+@@ -2201,6 +2202,9 @@ static int __ethtool_get_module_info(str
const struct ethtool_ops *ops = dev->ethtool_ops;
struct phy_device *phydev = dev->phydev;
@@ -169,7 +169,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (phydev && phydev->drv && phydev->drv->module_info)
return phydev->drv->module_info(phydev, modinfo);
-@@ -2224,6 +2228,9 @@ static int __ethtool_get_module_eeprom(s
+@@ -2235,6 +2239,9 @@ static int __ethtool_get_module_eeprom(s
const struct ethtool_ops *ops = dev->ethtool_ops;
struct phy_device *phydev = dev->phydev;