diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-06-24 12:27:36 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-06-24 12:27:36 +0000 |
| commit | e137e0e5b0a2592478ef622fb44ebd395b8d95f3 (patch) | |
| tree | b7eb4b6cf7565b4381cab1759f73b76f758624d6 /target/linux/generic | |
| parent | 3b59de8bc78bf0e2ef0daca8caa422cce60cc0b8 (diff) | |
| download | upstream-e137e0e5b0a2592478ef622fb44ebd395b8d95f3.tar.gz upstream-e137e0e5b0a2592478ef622fb44ebd395b8d95f3.tar.bz2 upstream-e137e0e5b0a2592478ef622fb44ebd395b8d95f3.zip | |
kernel: update 3.14 to 3.14.8
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41309 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
3 files changed, 7 insertions, 13 deletions
diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch index 28bd4d89f5..2983484596 100644 --- a/target/linux/generic/patches-3.14/100-overlayfs.patch +++ b/target/linux/generic/patches-3.14/100-overlayfs.patch @@ -318,7 +318,7 @@ extern const struct file_operations pipefifo_fops; --- a/fs/namei.c +++ b/fs/namei.c -@@ -413,6 +413,7 @@ int __inode_permission(struct inode *ino +@@ -414,6 +414,7 @@ int __inode_permission(struct inode *ino return security_inode_permission(inode, mask); } @@ -326,7 +326,7 @@ /** * sb_permission - Check superblock-level permissions -@@ -3035,9 +3036,12 @@ finish_open_created: +@@ -3036,9 +3037,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/552-ubifs-respect-silent-mount-flag.patch b/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch index 8f7df0d433..2e43d251dc 100644 --- a/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch +++ b/target/linux/generic/patches-3.14/552-ubifs-respect-silent-mount-flag.patch @@ -22,11 +22,9 @@ Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> --- -diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c -index e18b988..2290d58 100644 --- a/fs/ubifs/io.c +++ b/fs/ubifs/io.c -@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_info *c, void *buf, int type, int len, +@@ -988,30 +988,32 @@ int ubifs_read_node(const struct ubifs_i return err; if (type != ch->node_type) { @@ -67,11 +65,9 @@ index e18b988..2290d58 100644 return -EINVAL; } -diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c -index a81c7b5..3904c85 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c -@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info *c) +@@ -1149,6 +1149,9 @@ static int mount_ubifs(struct ubifs_info size_t sz; c->ro_mount = !!(c->vfs_sb->s_flags & MS_RDONLY); @@ -81,7 +77,7 @@ index a81c7b5..3904c85 100644 err = init_constants_early(c); if (err) return err; -@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info *c) +@@ -1214,6 +1217,8 @@ static int mount_ubifs(struct ubifs_info if (err) goto out_free; @@ -90,8 +86,6 @@ index a81c7b5..3904c85 100644 /* * Make sure the compressor which is set as default in the superblock * or overridden by mount options is actually compiled in. -diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h -index e8c8cfe..c1f71fe 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -51,6 +51,15 @@ diff --git a/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch b/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch index 6884346135..1fdd6e8dc3 100644 --- a/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch +++ b/target/linux/generic/patches-3.14/831-ledtrig_netdev.patch @@ -29,7 +29,7 @@ #include <linux/netdevice.h> #include <linux/timer.h> #include <linux/ctype.h> -@@ -307,8 +306,9 @@ done: +@@ -294,8 +293,9 @@ done: static void netdev_trig_timer(unsigned long arg) { struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; @@ -40,7 +40,7 @@ write_lock(&trigger_data->lock); -@@ -318,7 +318,7 @@ static void netdev_trig_timer(unsigned l +@@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l goto no_restart; } |