From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Christian Brauner <brauner@kernel•org>
Cc: Jeff Layton <jlayton@kernel•org>,
Networking <netdev@vger•kernel.org>,
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 net-next tree with the vfs-brauner tree
Date: Fri, 20 Jun 2025 12:11:22 +1000 [thread overview]
Message-ID: <20250620121122.344c1d0d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/core/net_namespace.c
between commit:
9b0240b3ccc3 ("netns: use stable inode number for initial mount ns")
from the vfs-brauner tree and commit:
8f2079f8da5b ("net: add symlinks to ref_tracker_dir for netns")
from the net-next 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 net/core/net_namespace.c
index 03cf87d3b380,d0f607507ee8..000000000000
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@@ -796,11 -821,10 +821,15 @@@ static __net_init int net_ns_net_init(s
#ifdef CONFIG_NET_NS
net->ns.ops = &netns_operations;
#endif
- ret = ns_alloc_inum(&net->ns);
+ if (net == &init_net) {
+ net->ns.inum = PROC_NET_INIT_INO;
- return 0;
++ ret = 0;
++ } else {
++ ret = ns_alloc_inum(&net->ns);
+ }
- return ns_alloc_inum(&net->ns);
+ if (!ret)
+ net_ns_net_debugfs(net);
+ return ret;
}
static __net_exit void net_ns_net_exit(struct net *net)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-06-20 2:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-20 2:11 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-26 2:37 linux-next: manual merge of the net-next tree with the vfs-brauner tree Stephen Rothwell
2025-02-28 2:29 Stephen Rothwell
2025-02-28 3:36 ` Lin Feng
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=20250620121122.344c1d0d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brauner@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=jlayton@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(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