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/
/**
* 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;
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);
}
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);
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/