diff --git a/[refs] b/[refs] index 520196319ee2..83e8aa0c4cdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c450f371d48557e3e0fa510a4af27b92f0d8c4cc +refs/heads/master: 4f326c0064b20b78b8041f4d2f6fe188a1129f18 diff --git a/trunk/fs/proc/root.c b/trunk/fs/proc/root.c index f2f251158d35..c6e9fac26bac 100644 --- a/trunk/fs/proc/root.c +++ b/trunk/fs/proc/root.c @@ -145,6 +145,7 @@ static struct file_system_type proc_fs_type = { .name = "proc", .mount = proc_mount, .kill_sb = proc_kill_sb, + .fs_flags = FS_USERNS_MOUNT, }; void __init proc_root_init(void) diff --git a/trunk/fs/sysfs/mount.c b/trunk/fs/sysfs/mount.c index 71eb7e253927..db940a9be045 100644 --- a/trunk/fs/sysfs/mount.c +++ b/trunk/fs/sysfs/mount.c @@ -149,6 +149,7 @@ static struct file_system_type sysfs_fs_type = { .name = "sysfs", .mount = sysfs_mount, .kill_sb = sysfs_kill_sb, + .fs_flags = FS_USERNS_MOUNT, }; int __init sysfs_init(void)