aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.14
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-01-11 01:28:32 +0000
committerLuka Perkov <luka@openwrt.org>2015-01-11 01:28:32 +0000
commitb78cddafcc74d83fe93057bd8623ae0701a4c93f (patch)
tree62258e8cc8f684570a6dfc9f3ee21a95a2fbf75c /target/linux/generic/patches-3.14
parent884a01d8a4e88d5f21a69ad555df26c0baac02bc (diff)
downloadupstream-b78cddafcc74d83fe93057bd8623ae0701a4c93f.tar.gz
upstream-b78cddafcc74d83fe93057bd8623ae0701a4c93f.tar.bz2
upstream-b78cddafcc74d83fe93057bd8623ae0701a4c93f.zip
kernel: update 3.14 to 3.14.28
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43929
Diffstat (limited to 'target/linux/generic/patches-3.14')
-rw-r--r--target/linux/generic/patches-3.14/100-overlayfs.patch4
-rw-r--r--target/linux/generic/patches-3.14/941-ocf_20120127.patch2
2 files changed, 3 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 a04b1fefca..bbf23a7a5d 100644
--- a/target/linux/generic/patches-3.14/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.14/100-overlayfs.patch
@@ -279,7 +279,7 @@
obj-$(CONFIG_OMFS_FS) += omfs/
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
-@@ -566,6 +566,13 @@ static struct dentry *ecryptfs_mount(str
+@@ -576,6 +576,13 @@ static struct dentry *ecryptfs_mount(str
s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
s->s_blocksize = path.dentry->d_sb->s_blocksize;
s->s_magic = ECRYPTFS_SUPER_MAGIC;
@@ -344,7 +344,7 @@
goto out;
--- a/fs/namespace.c
+++ b/fs/namespace.c
-@@ -1581,6 +1581,33 @@ void drop_collected_mounts(struct vfsmou
+@@ -1586,6 +1586,33 @@ void drop_collected_mounts(struct vfsmou
namespace_unlock();
}
diff --git a/target/linux/generic/patches-3.14/941-ocf_20120127.patch b/target/linux/generic/patches-3.14/941-ocf_20120127.patch
index b8b1eed9bd..b744026cb1 100644
--- a/target/linux/generic/patches-3.14/941-ocf_20120127.patch
+++ b/target/linux/generic/patches-3.14/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);
}