Subject: Re: linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree

From: Andrew Morton <[email-masked]>
Date: Wed, 19 Nov 2025 16:49:23 -0800

On Thu, 20 Nov 2025 11:44:55 +1100 Stephen Rothwell <[email-masked]> wrote:

> Today's linux-next merge of the vfs-brauner tree got a semantic
> conflict in:
> 
>   kernel/fork.c
> 
> between commit:
> 
>   42d3299e85f8 ("unshare: fix nsproxy leak on set_cred_ucounts() error path")
> 
> from the mm-nonmm-unstable tree and commit:
> 
>   cefd55bd2159 ("nsproxy: fix free_nsproxy() and simplify create_new_namespaces()")
> 
> from the vfs-brauner tree.

Thanks.  I'll send the mm.git patch to Christian.  I'll then drop it
and forget all about it!