diff --git a/[refs] b/[refs]
index cc29e68b85e3..24f7663dbf91 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3c6761d9b5cc82deea7416d11c2118f6380e99c
+refs/heads/master: 2b8576cb09a7b1b581c253554bf9e05d3adce7d6
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 5c90d84c2b02..197ca5eccbae 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -2766,6 +2766,7 @@ static struct file_system_type shmem_fs_type = {
 	.name		= "tmpfs",
 	.mount		= shmem_mount,
 	.kill_sb	= kill_litter_super,
+	.fs_flags	= FS_USERNS_MOUNT,
 };
 
 int __init shmem_init(void)
@@ -2823,6 +2824,7 @@ static struct file_system_type shmem_fs_type = {
 	.name		= "tmpfs",
 	.mount		= ramfs_mount,
 	.kill_sb	= kill_litter_super,
+	.fs_flags	= FS_USERNS_MOUNT,
 };
 
 int __init shmem_init(void)