diff --git a/[refs] b/[refs]
index 2d8fc4dd8f22..e43b992f404f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec98ce480ada787f2cfbd696980ff3564415505b
+refs/heads/master: c37bbb0fdcc01610fd55604eb6927210a1d20044
diff --git a/trunk/kernel/user.c b/trunk/kernel/user.c
index 97202cb29adc..6c924bc48c08 100644
--- a/trunk/kernel/user.c
+++ b/trunk/kernel/user.c
@@ -246,6 +246,8 @@ static int uids_user_create(struct user_struct *up)
 	int error;
 
 	memset(kobj, 0, sizeof(struct kobject));
+	if (up->user_ns != &init_user_ns)
+		return 0;
 	kobj->kset = uids_kset;
 	error = kobject_init_and_add(kobj, &uids_ktype, NULL, "%d", up->uid);
 	if (error) {
@@ -281,6 +283,8 @@ static void remove_user_sysfs_dir(struct work_struct *w)
 	unsigned long flags;
 	int remove_user = 0;
 
+	if (up->user_ns != &init_user_ns)
+		return;
 	/* Make uid_hash_remove() + sysfs_remove_file() + kobject_del()
 	 * atomic.
 	 */