diff --git a/[refs] b/[refs] index 5ed339450fdd..f142122e5721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9550b105b8646f916862aee3ab7b25020ca14159 +refs/heads/master: 626ac545c12e5f9bffe93086d1d03d26c99987ea diff --git a/trunk/include/linux/user_namespace.h b/trunk/include/linux/user_namespace.h index bb320573bb9e..1101b0ce878f 100644 --- a/trunk/include/linux/user_namespace.h +++ b/trunk/include/linux/user_namespace.h @@ -49,7 +49,7 @@ static inline struct user_namespace *copy_user_ns(int flags, if (flags & CLONE_NEWUSER) return ERR_PTR(-EINVAL); - return NULL; + return old_ns; } static inline void put_user_ns(struct user_namespace *ns)