From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christian Brauner <brauner@kernel•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Pavel Tikhomirov <ptikhomirov@virtuozzo•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree
Date: Thu, 20 Nov 2025 11:44:55 +1100 [thread overview]
Message-ID: <20251120114455.5e12988f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]
Hi all,
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.
I fixed it up (I applied the following fix patch) and can carry the fix
as necessary. This is now fixed as far as linux-next is concerned, but
any non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Thu, 20 Nov 2025 11:20:10 +1100
Subject: [PATCH] fix up for "nsproxy: fix free_nsproxy() and simplify create_new_namespaces()"
from the vfs-brauner tree interacting with "unshare: fix nsproxy leak on
set_cred_ucounts() error path" from the mm-nonmm-unstable tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/fork.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/fork.c b/kernel/fork.c
index 829d6518f352..adef2595182b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -3136,7 +3136,7 @@ int ksys_unshare(unsigned long unshare_flags)
err = set_cred_ucounts(new_cred);
if (err) {
if (new_nsproxy)
- free_nsproxy(new_nsproxy);
+ deactivate_nsproxy(new_nsproxy);
goto bad_unshare_cleanup_cred;
}
}
--
2.51.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-20 0:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-20 0:44 Stephen Rothwell [this message]
2025-11-20 0:49 ` linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree Andrew Morton
-- 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=20251120114455.5e12988f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=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 \
/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