diff --git a/[refs] b/[refs]
index 12897e4e1131..284de31fa3df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 123be07b0b399670a7cc3d82fef0cb4f93ef885c
+refs/heads/master: e5a4738699d6eca408dcb225bd350413927701e2
diff --git a/trunk/kernel/pid_namespace.c b/trunk/kernel/pid_namespace.c
index 821722ae58a7..86b3796b0436 100644
--- a/trunk/kernel/pid_namespace.c
+++ b/trunk/kernel/pid_namespace.c
@@ -118,7 +118,7 @@ struct pid_namespace *copy_pid_ns(unsigned long flags, struct pid_namespace *old
 {
 	if (!(flags & CLONE_NEWPID))
 		return get_pid_ns(old_ns);
-	if (flags & CLONE_THREAD)
+	if (flags & (CLONE_THREAD|CLONE_PARENT))
 		return ERR_PTR(-EINVAL);
 	return create_pid_namespace(old_ns);
 }