diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-04-09 16:16:20 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2013-04-09 16:16:20 +0000 |
commit | f79b8bc0ec34db73336b48aba6c824c2c1e9342d (patch) | |
tree | 3fee9ec05b5b01f11df78a3cdcd6158a08c811ab /target/linux/generic/patches-3.9/100-overlayfs.patch | |
parent | 7251e4fdeb14ae839f19cd15f1b6d0a49188a9d1 (diff) | |
download | upstream-f79b8bc0ec34db73336b48aba6c824c2c1e9342d.tar.gz upstream-f79b8bc0ec34db73336b48aba6c824c2c1e9342d.tar.bz2 upstream-f79b8bc0ec34db73336b48aba6c824c2c1e9342d.zip |
kernel: refresh patches against 3.9-rc6
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36297 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.9/100-overlayfs.patch')
-rw-r--r-- | target/linux/generic/patches-3.9/100-overlayfs.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.9/100-overlayfs.patch b/target/linux/generic/patches-3.9/100-overlayfs.patch index a4bb686e9b..ae1f2f3a23 100644 --- a/target/linux/generic/patches-3.9/100-overlayfs.patch +++ b/target/linux/generic/patches-3.9/100-overlayfs.patch @@ -243,7 +243,7 @@ will be called when part or all of the page is to be removed --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5905,6 +5905,13 @@ F: drivers/scsi/osd/ +@@ -5911,6 +5911,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ @@ -335,7 +335,7 @@ goto out; --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1399,6 +1399,24 @@ void drop_collected_mounts(struct vfsmou +@@ -1403,6 +1403,24 @@ void drop_collected_mounts(struct vfsmou release_mounts(&umount_list); } @@ -3118,7 +3118,7 @@ +module_exit(ovl_exit); --- a/fs/splice.c +++ b/fs/splice.c -@@ -1308,6 +1308,7 @@ long do_splice_direct(struct file *in, l +@@ -1310,6 +1310,7 @@ long do_splice_direct(struct file *in, l return ret; } @@ -3179,7 +3179,7 @@ static inline bool execute_ok(struct inode *inode) --- a/include/linux/mount.h +++ b/include/linux/mount.h -@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt +@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt extern void mnt_unpin(struct vfsmount *mnt); extern int __mnt_is_readonly(struct vfsmount *mnt); |