kernel: update 3.10 to 3.10.32

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

diff --git a/target/linux/generic/patches-3.10/100-overlayfs.patch b/target/linux/generic/patches-3.10/100-overlayfs.patch
index 5d1c5f6..02894b3 100644 (file)
--- a/target/linux/generic/patches-3.10/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.10/100-overlayfs.patch
@@ -330,7 +330,7 @@
  
  /**
   * sb_permission - Check superblock-level permissions
-@@ -2867,9 +2868,12 @@ finish_open_created:
+@@ -2868,9 +2869,12 @@ finish_open_created:
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;
@@ -3149,7 +3149,7 @@
 +module_exit(ovl_exit);
 --- a/fs/splice.c
 +++ b/fs/splice.c
-@@ -1313,6 +1313,7 @@ long do_splice_direct(struct file *in, l
+@@ -1331,6 +1331,7 @@ long do_splice_direct(struct file *in, l
  
        return ret;
  }