From 7a2b8a48f6600af0bd8f14f5932f97bc1f3a4555 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Fri, 8 Aug 2014 13:38:22 +0000 Subject: kernel: update 3.14 to 3.14.16 Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42070 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/patches-3.14/100-overlayfs.patch | 2 +- target/linux/generic/patches-3.14/616-net_optimize_xfrm_calls.patch | 1 - target/linux/generic/patches-3.14/921-use_preinit_as_init.patch | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch index 2983484596..45cdd50205 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 088d32d407..a4e4157300 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 64c4ce2c12..df703a7587 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); } -- cgit v1.2.3