summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.14
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-08-08 13:38:22 +0000
committerLuka Perkov <luka@openwrt.org>2014-08-08 13:38:22 +0000
commitdd8d72909634e0ba521519748827cb06f8c3f37d (patch)
treef43bc5d2e2fc1a21ea27855f88182ed11c126405 /target/linux/generic/patches-3.14
parentc1d698fce45c485516b2358d78cc976e8515862c (diff)
downloadmtk-20170518-dd8d72909634e0ba521519748827cb06f8c3f37d.zip
mtk-20170518-dd8d72909634e0ba521519748827cb06f8c3f37d.tar.gz
mtk-20170518-dd8d72909634e0ba521519748827cb06f8c3f37d.tar.bz2
kernel: update 3.14 to 3.14.16
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42070
Diffstat (limited to 'target/linux/generic/patches-3.14')
-rw-r--r--target/linux/generic/patches-3.14/100-overlayfs.patch2
-rw-r--r--target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch1
-rw-r--r--target/linux/generic/patches-3.14/921-use_preinit_as_init.patch2
3 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch
index 2983484..45cdd50 100644
--- a/target/linux/generic/patches-3.14/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.14/100-overlayfs.patch
@@ -326,7 +326,7 @@
/**
* sb_permission - Check superblock-level permissions
-@@ -3036,9 +3037,12 @@ finish_open_created:
+@@ -3037,9 +3038,12 @@ finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;
diff --git a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
index 088d32d..a4e4157 100644
--- a/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
+++ b/target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch
@@ -10,4 +10,3 @@
err = xfrm_decode_session(skb, &fl, family);
if (err < 0)
return err;
-
diff --git a/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
index 64c4ce2..df703a7 100644
--- a/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.14/921-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -868,7 +868,8 @@ static int __ref kernel_init(void *unuse
+@@ -872,7 +872,8 @@ static int __ref kernel_init(void *unuse
pr_err("Failed to execute %s (error %d). Attempting defaults...\n",
execute_command, ret);
}