aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-01-09 12:35:19 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-01-09 12:35:19 +0000
commit182bbf60b75605535671757fc8c4e7af9385418e (patch)
tree18562139cd7a0ec518c3d4f6a5835b1259a0bb4c
parent39d0b8fea8c8731fb6829f8568edaec80bdf44db (diff)
downloadupstream-182bbf60b75605535671757fc8c4e7af9385418e.tar.gz
upstream-182bbf60b75605535671757fc8c4e7af9385418e.tar.bz2
upstream-182bbf60b75605535671757fc8c4e7af9385418e.zip
upgrade to 3.18.2
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 43892
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/patches-3.18/941-ocf_20120127.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 1c80a8f68f..856d8755fb 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,14 +7,14 @@ LINUX_VERSION-3.8 = .13
LINUX_VERSION-3.10 = .58
LINUX_VERSION-3.13 = .7
LINUX_VERSION-3.14 = .27
-LINUX_VERSION-3.18 = .1
+LINUX_VERSION-3.18 = .2
LINUX_KERNEL_MD5SUM-3.3.8 = f1058f64eed085deb44f10cee8541d50
LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d
LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01
LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f
LINUX_KERNEL_MD5SUM-3.14.27 = 0af2d0702df6ee6d7181e697e0af3481
-LINUX_KERNEL_MD5SUM-3.18.1 = 79c9b73a01e1dce0a4c28828496ef02c
+LINUX_KERNEL_MD5SUM-3.18.2 = 7b28d5543cf3647d2483830af19f3770
ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
diff --git a/target/linux/generic/patches-3.18/941-ocf_20120127.patch b/target/linux/generic/patches-3.18/941-ocf_20120127.patch
index cc512f8359..ee36f1ee49 100644
--- a/target/linux/generic/patches-3.18/941-ocf_20120127.patch
+++ b/target/linux/generic/patches-3.18/941-ocf_20120127.patch
@@ -156,7 +156,7 @@
void generate_random_uuid(unsigned char uuid_out[16]);
--- a/kernel/pid.c
+++ b/kernel/pid.c
-@@ -425,6 +425,7 @@ void transfer_pid(struct task_struct *ol
+@@ -427,6 +427,7 @@ void transfer_pid(struct task_struct *ol
new->pids[type].pid = old->pids[type].pid;
hlist_replace_rcu(&old->pids[type].node, &new->pids[type].node);
}