public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
* linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree
@ 2026-01-13  1:21 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2026-01-13  1:21 UTC (permalink / raw)
  To: Christian Brauner, Andrew Morton
  Cc: Jeff Layton, Linux Kernel Mailing List, Linux Next Mailing List,
	Randy Dunlap

[-- Attachment #1: Type: text/plain, Size: 1068 bytes --]

Hi all,

Today's linux-next merge of the vfs-brauner tree got a conflict in:

  fs/fat/dir.c

between commit:

  30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")

from the mm-nonmm-unstable tree and commit:

  a9acc8422ffb ("fat: add setlease file operation")

from the vfs-brauner tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/fat/dir.c
index af7dedf8adcb,07d95f1442c8..000000000000
--- a/fs/fat/dir.c
+++ b/fs/fat/dir.c
@@@ -16,7 -16,7 +16,8 @@@
  
  #include <linux/slab.h>
  #include <linux/compat.h>
 +#include <linux/hex.h>
+ #include <linux/filelock.h>
  #include <linux/uaccess.h>
  #include <linux/iversion.h>
  #include "fat.h"

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree
@ 2025-12-18  5:16 Stephen Rothwell
  0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-12-18  5:16 UTC (permalink / raw)
  To: Christian Brauner, Andrew Morton
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Mateusz Guzik

[-- Attachment #1: Type: text/plain, Size: 736 bytes --]

Hi all,

Today's linux-next merge of the fs-next tree got a conflict in:

  kernel/pid.c

between commit:

  0367a5dd4b09 ("pid: only take pidmap_lock once on alloc")

from the mm-nonmm-unstable tree and commit:

  6d864a1b1825 ("pid: only take pidmap_lock once on alloc")

from the fs-next tree.

I fixed it up (I just used the latter) 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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread
* linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree
@ 2025-11-20  0:44 Stephen Rothwell
  2025-11-20  0:49 ` Andrew Morton
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-20  0:44 UTC (permalink / raw)
  To: Christian Brauner, Andrew Morton
  Cc: Pavel Tikhomirov, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- 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 --]

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-01-13  1:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-13  1:21 linux-next: manual merge of the vfs-brauner tree with the mm-nonmm-unstable tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2025-12-18  5:16 Stephen Rothwell
2025-11-20  0:44 Stephen Rothwell
2025-11-20  0:49 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox