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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20251119164923.1ec72b4d237816e140c5e717@linux-foundation.org>
Date: Wed, 19 Nov 2025 16:49:23 -0800
From: Andrew Morton <akpm@...ux-foundation.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Christian Brauner <brauner@...nel.org>, Pavel Tikhomirov
 <ptikhomirov@...tuozzo.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the
 mm-nonmm-unstable tree

On Thu, 20 Nov 2025 11:44:55 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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!