aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-05-14 21:49:27 +0000
committerLuka Perkov <luka@openwrt.org>2014-05-14 21:49:27 +0000
commit645596489ff4759a4767f6e4e6901f21709774a5 (patch)
tree023ea649cff9aa1f08d274cc760f94cbe5f6a298
parent74906592549c6ca238562e740f1e61ed5fc6371f (diff)
downloadupstream-645596489ff4759a4767f6e4e6901f21709774a5.tar.gz
upstream-645596489ff4759a4767f6e4e6901f21709774a5.tar.bz2
upstream-645596489ff4759a4767f6e4e6901f21709774a5.zip
kernel: update 3.14 to 3.14.4
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 40769
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/patches-3.14/902-debloat_proc.patch2
-rw-r--r--target/linux/x86_64/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 50fcfcb2ba..ffd0d9111e 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -26,8 +26,8 @@ endif
ifeq ($(LINUX_VERSION),3.13.7)
LINUX_KERNEL_MD5SUM:=370adced5e5c1cb1d0d621c2dae2723f
endif
-ifeq ($(LINUX_VERSION),3.14.3)
- LINUX_KERNEL_MD5SUM:=99043433ad7368d2471b4743c9f562a2
+ifeq ($(LINUX_VERSION),3.14.4)
+ LINUX_KERNEL_MD5SUM:=c7c565d14833550faa39ef8279272182
endif
# disable the md5sum check for unknown kernel versions
diff --git a/target/linux/generic/patches-3.14/902-debloat_proc.patch b/target/linux/generic/patches-3.14/902-debloat_proc.patch
index 8306a0b0d1..87909fd8cf 100644
--- a/target/linux/generic/patches-3.14/902-debloat_proc.patch
+++ b/target/linux/generic/patches-3.14/902-debloat_proc.patch
@@ -1,6 +1,6 @@
--- a/fs/locks.c
+++ b/fs/locks.c
-@@ -2430,6 +2430,8 @@ static const struct file_operations proc
+@@ -2429,6 +2429,8 @@ static const struct file_operations proc
static int __init proc_locks_init(void)
{
diff --git a/target/linux/x86_64/Makefile b/target/linux/x86_64/Makefile
index 43326b2185..e995dae4dc 100644
--- a/target/linux/x86_64/Makefile
+++ b/target/linux/x86_64/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=x86_64
FEATURES:=ext4 vdi vmdk targz
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=3.14.3
+LINUX_VERSION:=3.14.4
KERNELNAME:=bzImage