diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-22 14:13:40 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-22 15:29:01 +0200 |
| commit | 270b9d30f68fe25f6b17dbe5160efdb540ecd185 (patch) | |
| tree | 25d12713c5ffda607f090d285b0ec23b6e146401 | |
| parent | 4dc42ef40eb51074d55c701c86ae5b49599c67b1 (diff) | |
| download | upstream-270b9d30f68fe25f6b17dbe5160efdb540ecd185.tar.gz upstream-270b9d30f68fe25f6b17dbe5160efdb540ecd185.tar.bz2 upstream-270b9d30f68fe25f6b17dbe5160efdb540ecd185.zip | |
kernel: bump 4.14 to 4.14.78
Refreshed all patches.
Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
3 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 487039e53b..f0ac2671ed 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-4.9 = .135 -LINUX_VERSION-4.14 = .77 +LINUX_VERSION-4.14 = .78 LINUX_KERNEL_HASH-4.9.135 = e023b0bbe9ea7fc56aa57210342dd18ea3e0900ee207226df1523c6d7df154ce -LINUX_KERNEL_HASH-4.14.77 = 0496f4e194cadbe23f27e6f4b9c3cd264448983780b73b30f7f05c92273fa6f8 +LINUX_KERNEL_HASH-4.14.78 = f4da4dc0f079e420e1c1b8c71312eaa5415b08be847aa224a61d8af6a6e74c6c 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/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch b/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch index e4a722646e..ba4fb5f717 100644 --- a/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch +++ b/target/linux/apm821xx/patches-4.14/030-0002-net-ibm-emac-replace-custom-PHY_MODE_-macros.patch @@ -47,7 +47,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> } static inline void emac_tx_enable(struct emac_instance *dev) -@@ -2865,7 +2865,7 @@ static int emac_init_config(struct emac_ +@@ -2870,7 +2870,7 @@ static int emac_init_config(struct emac_ /* PHY mode needs some decoding */ dev->phy_mode = of_get_phy_mode(np); if (dev->phy_mode < 0) @@ -56,7 +56,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com> /* Check EMAC version */ if (of_device_is_compatible(np, "ibm,emac4sync")) { -@@ -3168,7 +3168,7 @@ static int emac_probe(struct platform_de +@@ -3173,7 +3173,7 @@ static int emac_probe(struct platform_de printk(KERN_INFO "%s: EMAC-%d %pOF, MAC %pM\n", ndev->name, dev->cell_index, np, ndev->dev_addr); diff --git a/target/linux/apm821xx/patches-4.14/701-powerpc_ibm_apm82181_phyclk_fix.patch b/target/linux/apm821xx/patches-4.14/701-powerpc_ibm_apm82181_phyclk_fix.patch index 7f630a3c2a..ced284ee3b 100644 --- a/target/linux/apm821xx/patches-4.14/701-powerpc_ibm_apm82181_phyclk_fix.patch +++ b/target/linux/apm821xx/patches-4.14/701-powerpc_ibm_apm82181_phyclk_fix.patch @@ -30,7 +30,7 @@ #endif } -@@ -2879,6 +2888,7 @@ static int emac_init_config(struct emac_ +@@ -2884,6 +2893,7 @@ static int emac_init_config(struct emac_ if (of_device_is_compatible(np, "ibm,emac-apm821xx")) { dev->features |= (EMAC_APM821XX_REQ_JUMBO_FRAME_SIZE | EMAC_FTR_APM821XX_NO_HALF_DUPLEX | |