aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/100-overlayfs.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-10-29 02:19:05 +0000
committerLuka Perkov <luka@openwrt.org>2013-10-29 02:19:05 +0000
commit3aba97dcba059e15978e3eea037e3cbc7cc607e5 (patch)
tree4f8dc77dffd2019952d4623b536947a310eccc62 /target/linux/generic/patches-3.12/100-overlayfs.patch
parentf44c65c7c8d57b08c783051a55c7e3eb367e6f7b (diff)
downloadupstream-3aba97dcba059e15978e3eea037e3cbc7cc607e5.tar.gz
upstream-3aba97dcba059e15978e3eea037e3cbc7cc607e5.tar.bz2
upstream-3aba97dcba059e15978e3eea037e3cbc7cc607e5.zip
kernel: refresh 3.12 patches on -rc7 release
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 38572
Diffstat (limited to 'target/linux/generic/patches-3.12/100-overlayfs.patch')
-rw-r--r--target/linux/generic/patches-3.12/100-overlayfs.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.12/100-overlayfs.patch b/target/linux/generic/patches-3.12/100-overlayfs.patch
index 2e9e023b69..6f3ea9b22b 100644
--- a/target/linux/generic/patches-3.12/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.12/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
-@@ -6230,6 +6230,13 @@ F: drivers/scsi/osd/
+@@ -6245,6 +6245,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
@@ -326,7 +326,7 @@
/**
* sb_permission - Check superblock-level permissions
-@@ -3063,9 +3064,12 @@ finish_open_created:
+@@ -3064,9 +3065,12 @@ finish_open_created:
error = may_open(&nd->path, acc_mode, open_flag);
if (error)
goto out;