diff options
author | Luka Perkov <luka@openwrt.org> | 2015-01-11 01:28:32 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2015-01-11 01:28:32 +0000 |
commit | 725f724cc86cf6dea41eff8f2eb32b1499fd5385 (patch) | |
tree | 6116f84c29d3abfc8f4af16af03b25dd0e638510 /target/linux/generic/patches-3.14 | |
parent | e8a287dda63fe7065ba5aa14ba9c155401402f0b (diff) | |
download | upstream-725f724cc86cf6dea41eff8f2eb32b1499fd5385.tar.gz upstream-725f724cc86cf6dea41eff8f2eb32b1499fd5385.tar.bz2 upstream-725f724cc86cf6dea41eff8f2eb32b1499fd5385.zip |
kernel: update 3.14 to 3.14.28
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43929 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14')
-rw-r--r-- | target/linux/generic/patches-3.14/100-overlayfs.patch | 4 | ||||
-rw-r--r-- | target/linux/generic/patches-3.14/941-ocf_20120127.patch | 2 |
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); } |