aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-22 21:18:27 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-04-23 13:22:31 +0200
commitd27c2452161356d66500a2b96057d2f99a013097 (patch)
treea6f6ebb3a5e72dbf17904ddf65967320b2a087c7
parentf00a4ae6e0b1f7b3d84e11e8dc4dd562088584e0 (diff)
downloadupstream-d27c2452161356d66500a2b96057d2f99a013097.tar.gz
upstream-d27c2452161356d66500a2b96057d2f99a013097.tar.bz2
upstream-d27c2452161356d66500a2b96057d2f99a013097.zip
kernel: bump 4.9 to 4.9.170
Refreshed all patches. Compile-tested on: ar7 Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 36fc533d17..9938298427 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,12 +3,12 @@
LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .136
-LINUX_VERSION-4.9 = .169
+LINUX_VERSION-4.9 = .170
LINUX_VERSION-4.14 = .112
LINUX_VERSION-4.19 = .35
LINUX_KERNEL_HASH-3.18.136 = 48c8775013d23229462134f911bbb14c7935096fcccfb19ce28ecd5f7154f35c
-LINUX_KERNEL_HASH-4.9.169 = b776636c63a555961cfe9f6f4a315e65ab0ff3376acdb3cf5ad654808ff8d6b0
+LINUX_KERNEL_HASH-4.9.170 = 33887b40fc8e0b71f423bb7afe112a4ae190378145f4a3f3892c563b7e43131d
LINUX_KERNEL_HASH-4.14.112 = 326101e2cc80a0d7e643074fe9e63f0d6a9c8cf97033f8a07848de373203e472
LINUX_KERNEL_HASH-4.19.35 = 2fa7e560f0e020104c6e09ffb6c2242a8f5c4b5c39e41ed2996fa7b8b42047e0
diff --git a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
index 4937e11782..ca89f87594 100644
--- a/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
+++ b/target/linux/generic/pending-4.9/332-arc-add-OWRTDTB-section.patch
@@ -38,7 +38,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
;----------------------------------------------------------------
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
-@@ -436,7 +436,7 @@ ignore_uboot_args:
+@@ -444,7 +444,7 @@ ignore_uboot_args:
#endif
if (use_embedded_dtb) {
@@ -47,7 +47,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
if (!machine_desc)
panic("Embedded DT invalid\n");
}
-@@ -452,6 +452,8 @@ ignore_uboot_args:
+@@ -460,6 +460,8 @@ ignore_uboot_args:
}
}