Subject: Re: linux-next: manual merge of the userns tree with the cel tree

From: Mark Brown <[email-masked]>
Date: Thu, 16 Dec 2021 20:22:32 +0000

On Thu, Dec 16, 2021 at 07:34:12PM +0000, [email-masked] wrote:
> Hi all,
> 
> Today's linux-next merge of the userns tree got a conflict in:
> 
>   fs/nfsd/nfssvc.c

This is also causing further build errors including but not limited to:

/tmp/next/build/kernel/fork.c: In function 'copy_process':
/tmp/next/build/kernel/fork.c:2106:4: error: label 'bad_fork_cleanup_threadgroup_lock' used but not defined
 2106 |    goto bad_fork_cleanup_threadgroup_lock;
      |    ^~~~

Partly due to vaccine side effects and partly in the interest of time
I'm going to use the userns tree from yesterday.