kernel/3.8: update pci_disable_usb_common_quirks patch

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.8 / 100-overlayfs.patch

diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch
index f6c9a3c1669981a36fa0b715dd3e74c513f87440..26f373d1ebfa1590f91c654cbfd14015feca08a4 100644 (file)
--- a/target/linux/generic/patches-3.8/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.8/100-overlayfs.patch
@@ -279,8 +279,8 @@
  source "fs/fuse/Kconfig"
 +source "fs/overlayfs/Kconfig"
  
- config CUSE
-       tristate "Character device in Userspace support"
+ config GENERIC_ACL
+       bool
 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -107,6 +107,7 @@ obj-$(CONFIG_QNX6FS_FS)            += qnx6/
@@ -301,7 +301,7 @@
  
  /**
   * sb_permission - Check superblock-level permissions
-@@ -2878,9 +2879,12 @@ finish_open_created:
+@@ -2876,9 +2877,12 @@ finish_open_created:
        error = may_open(&nd->path, acc_mode, open_flag);
        if (error)
                goto out;
@@ -319,7 +319,7 @@
                goto out;
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1410,6 +1410,24 @@ void drop_collected_mounts(struct vfsmou
+@@ -1421,6 +1421,24 @@ void drop_collected_mounts(struct vfsmou
        release_mounts(&umount_list);
  }
  
@@ -3163,7 +3163,7 @@
  static inline bool execute_ok(struct inode *inode)
 --- a/include/linux/mount.h
 +++ b/include/linux/mount.h
-@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt
+@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt
  extern void mnt_unpin(struct vfsmount *mnt);
  extern int __mnt_is_readonly(struct vfsmount *mnt);
  
@@ -3175,7 +3175,7 @@
                                      int flags, const char *name,
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -5667,6 +5667,13 @@ F:      drivers/scsi/osd/
+@@ -5666,6 +5666,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/