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
commit672edbbcc089f143eee2bdeb3088858e2f5c7034 (patch)
tree4ed9ec0fb95d358bb0c60755b14b140a1159ab18 /target/linux/generic/patches-3.12/100-overlayfs.patch
parent58abdeaa982a1531e10556028cdbe78123c595c6 (diff)
downloadupstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.tar.gz
upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.tar.bz2
upstream-672edbbcc089f143eee2bdeb3088858e2f5c7034.zip
kernel: refresh 3.12 patches on -rc7 release
Signed-off-by: Luka Perkov <luka@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38572 3c298f89-4303-0410-b956-a3cf2f4a3e73
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;