From: Andrew Morton <akpm@linux-foundation•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Christian Brauner <brauner@kernel•org>,
Pavel Tikhomirov <ptikhomirov@virtuozzo•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree
Date: Wed, 19 Nov 2025 16:49:23 -0800 [thread overview]
Message-ID: <20251119164923.1ec72b4d237816e140c5e717@linux-foundation.org> (raw)
In-Reply-To: <20251120114455.5e12988f@canb.auug.org.au>
On Thu, 20 Nov 2025 11:44:55 +1100 Stephen Rothwell <sfr@canb•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!
next prev parent reply other threads:[~2025-11-20 0:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-20 0:44 linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree Stephen Rothwell
2025-11-20 0:49 ` Andrew Morton [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-12-18 5:16 Stephen Rothwell
2026-01-13 1:21 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251119164923.1ec72b4d237816e140c5e717@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ptikhomirov@virtuozzo$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox