kernel: refresh 3.12 patches on -rc7 release

[openwrt.git] / target / linux / generic / patches-3.12 / 100-overlayfs.patch

diff --git a/target/linux/generic/patches-3.12/100-overlayfs.patch b/target/linux/generic/patches-3.12/100-overlayfs.patch
index 2e9e023..6f3ea9b 100644 (file)
--- 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
          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/
  
  F:    include/scsi/osd_*
  F:    fs/exofs/
  


@@ -326,7 +326,7 @@
  
  /**
   * sb_permission - Check superblock-level permissions
  
  /**
   * 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;
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;