From 36fefbb60e17cf2978b5ea0f954ef992e02c9ca3 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Mon, 31 Mar 2014 13:43:06 +0000 Subject: 3.14 final is out Signed-off-by: Imre Kaloz SVN-Revision: 40352 --- target/linux/generic/patches-3.14/100-overlayfs.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/patches-3.14/100-overlayfs.patch') diff --git a/target/linux/generic/patches-3.14/100-overlayfs.patch b/target/linux/generic/patches-3.14/100-overlayfs.patch index 5a7150d..9007c96 100644 --- a/target/linux/generic/patches-3.14/100-overlayfs.patch +++ b/target/linux/generic/patches-3.14/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 -@@ -6451,6 +6451,13 @@ F: drivers/scsi/osd/ +@@ -6452,6 +6452,13 @@ F: drivers/scsi/osd/ F: include/scsi/osd_* F: fs/exofs/ @@ -326,7 +326,7 @@ /** * sb_permission - Check superblock-level permissions -@@ -3038,9 +3039,12 @@ finish_open_created: +@@ -3035,9 +3036,12 @@ finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); if (error) goto out; @@ -344,7 +344,7 @@ goto out; --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1495,6 +1495,33 @@ void drop_collected_mounts(struct vfsmou +@@ -1541,6 +1541,33 @@ void drop_collected_mounts(struct vfsmou namespace_unlock(); } -- cgit v1.1