diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-18 15:11:42 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-22 21:16:53 +0200 |
| commit | ac3b5f00e17de2c7791748f6fa434eb93ee3b66e (patch) | |
| tree | 81358c66636e1e1662386d9708452a2b6dd8d40e | |
| parent | 15a70d085d1bb278a198f4666ab27000980020cc (diff) | |
| download | upstream-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>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/config-4.14 | 1 | ||||
| -rw-r--r-- | target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 1ebd465b63..d77dd15f36 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.9 = .169 -LINUX_VERSION-4.14 = .111 +LINUX_VERSION-4.14 = .112 LINUX_KERNEL_HASH-4.9.169 = b776636c63a555961cfe9f6f4a315e65ab0ff3376acdb3cf5ad654808ff8d6b0 -LINUX_KERNEL_HASH-4.14.111 = f8197d56553f864d1d2e97abbe4fca50f8ab5e72089c292d22f0e4395340a6e8 +LINUX_KERNEL_HASH-4.14.112 = 326101e2cc80a0d7e643074fe9e63f0d6a9c8cf97033f8a07848de373203e472 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index ea5aeed90a..10aba65a72 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -2269,6 +2269,7 @@ CONFIG_LBDAF=y # CONFIG_LCD_S6E63M0 is not set # CONFIG_LCD_TDO24M is not set # CONFIG_LCD_VGG2432A4 is not set +CONFIG_LDISC_AUTOLOAD=y # CONFIG_LDM_PARTITION is not set CONFIG_LD_DEAD_CODE_DATA_ELIMINATION=y # CONFIG_LEDS_BCM6328 is not set 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; |