kernel: bump 4.14 to 4.14.113

Refreshed all patches.

Compile-tested on: cns3xxx, imx6
Runtime-tested on: cns3xxx, imx6

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 993829842711ff8469407a8f40420bd8bd96281f..3b11d3ecb6532832a8ded2441d4ab88ab9eb2d15 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .136
 LINUX_VERSION-4.9 = .170
 
 LINUX_VERSION-3.18 = .136
 LINUX_VERSION-4.9 = .170

-LINUX_VERSION-4.14 = .112
+LINUX_VERSION-4.14 = .113

 LINUX_VERSION-4.19 = .35
 
 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
 LINUX_KERNEL_HASH-4.9.170 = 33887b40fc8e0b71f423bb7afe112a4ae190378145f4a3f3892c563b7e43131d
 LINUX_VERSION-4.19 = .35
 
 LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
 LINUX_KERNEL_HASH-4.9.170 = 33887b40fc8e0b71f423bb7afe112a4ae190378145f4a3f3892c563b7e43131d

-LINUX_KERNEL_HASH-4.14.112 = 326101e2cc80a0d7e643074fe9e63f0d6a9c8cf97033f8a07848de373203e472
+LINUX_KERNEL_HASH-4.14.113 = b24df2e37faaf2290999c507f9e29de98494f52429bcd35513c5b3e52eaddac2

 LINUX_KERNEL_HASH-4.19.35 = 2fa7e560f0e020104c6e09ffb6c2242a8f5c4b5c39e41ed2996fa7b8b42047e0
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 LINUX_KERNEL_HASH-4.19.35 = 2fa7e560f0e020104c6e09ffb6c2242a8f5c4b5c39e41ed2996fa7b8b42047e0
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

diff --git a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
index 6aa90c9eafb293e403ec70e1aef25a2ea0b0a18a..4c8d6e9d3721bbf46afcc47c05ea01fc040334b1 100644 (file)
--- a/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
+++ b/target/linux/generic/pending-4.14/332-arc-add-OWRTDTB-section.patch
@@ -42,16 +42,16 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com>
  ;----------------------------------------------------------------
 --- a/arch/arc/kernel/setup.c
 +++ b/arch/arc/kernel/setup.c
  ;----------------------------------------------------------------
 --- a/arch/arc/kernel/setup.c
 +++ b/arch/arc/kernel/setup.c

-@@ -434,6 +434,8 @@ static inline bool uboot_arg_invalid(uns
- #define UBOOT_TAG_CMDLINE     1
- #define UBOOT_TAG_DTB         2
+@@ -437,6 +437,8 @@ static inline bool uboot_arg_invalid(uns
+ /* We always pass 0 as magic from U-boot */
+ #define UBOOT_MAGIC_VALUE     0

  
 +extern struct boot_param_header __image_dtb;
 +
  void __init handle_uboot_args(void)
  {
        bool use_embedded_dtb = true;
  
 +extern struct boot_param_header __image_dtb;
 +
  void __init handle_uboot_args(void)
  {
        bool use_embedded_dtb = true;

-@@ -469,7 +471,7 @@ ignore_uboot_args:
+@@ -477,7 +479,7 @@ ignore_uboot_args:

  #endif
  
        if (use_embedded_dtb) {
  #endif
  
        if (use_embedded_dtb) {