diff --git a/[refs] b/[refs] index 832c060bb637..d7f847967cf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 398eb08555b24049e0362fee92920982b283fd96 +refs/heads/master: bf5315366b1b708a0dd322bb389e970598f18891 diff --git a/trunk/kernel/utsname.c b/trunk/kernel/utsname.c index 08b197e8c485..a47fc5de3113 100644 --- a/trunk/kernel/utsname.c +++ b/trunk/kernel/utsname.c @@ -30,7 +30,7 @@ static struct uts_namespace *create_uts_ns(void) /* * Clone a new ns copying an original utsname, setting refcount to 1 * @old_ns: namespace to clone - * Return NULL on error (failure to kmalloc), new ns otherwise + * Return ERR_PTR(-ENOMEM) on error (failure to kmalloc), new ns otherwise */ static struct uts_namespace *clone_uts_ns(struct user_namespace *user_ns, struct uts_namespace *old_ns)