aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-26 12:49:56 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-09-26 15:54:18 +0200
commit17e90d88e2e1973055f793033753960c9384c17d (patch)
tree13c27d1987a02a9e96dd7e565a7a433b6ef65025
parenta6add47869972139cef9106aecfddbac0b3f64f4 (diff)
downloadupstream-17e90d88e2e1973055f793033753960c9384c17d.tar.gz
upstream-17e90d88e2e1973055f793033753960c9384c17d.tar.bz2
upstream-17e90d88e2e1973055f793033753960c9384c17d.zip
kernel: bump 3.18 to 3.18.123
Refreshed all patches. Compile-tested on: adm5120 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/adm5120/patches-3.18/100-rootfs_split.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 4f6cb2d761..c1f859e4a2 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -2,13 +2,13 @@
LINUX_RELEASE?=1
-LINUX_VERSION-3.18 = .122
LINUX_VERSION-4.9 = .128
LINUX_VERSION-4.14 = .71
+LINUX_VERSION-3.18 = .123
-LINUX_KERNEL_HASH-3.18.122 = 675b1ce36af23caa500cb1d4f0ec2976791fb0a97ebb6486a5e2ebcb5527ade5
LINUX_KERNEL_HASH-4.9.128 = bdb76f48491a6aadc89c0f0f7fdc240d77cee54da5aac59da0b5d98e226b6f12
LINUX_KERNEL_HASH-4.14.71 = 76a4473dbcbd922c23a16130414829a36eb7e2f4e5859bd1b742fffdff907489
+LINUX_KERNEL_HASH-3.18.123 = c10de32c9b31fb619b016a00d77afc394db5a4542e258e927f06a5ead86f8c64
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/adm5120/patches-3.18/100-rootfs_split.patch b/target/linux/adm5120/patches-3.18/100-rootfs_split.patch
index dfc0e83a03..aa1ede5e32 100644
--- a/target/linux/adm5120/patches-3.18/100-rootfs_split.patch
+++ b/target/linux/adm5120/patches-3.18/100-rootfs_split.patch
@@ -246,7 +246,7 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -1008,6 +1008,12 @@ static int mtdchar_ioctl(struct file *fi
+@@ -1012,6 +1012,12 @@ static int mtdchar_ioctl(struct file *fi
break;
}