linux-next: manual merge of the net-next tree with the vfs-brauner tree

linux-next: manual merge of the net-next tree with the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

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

  net/unix/af_unix.c

between commit:

  fd0a109a0f6b ("net, pidfs: prepare for handing out pidfds for reaped sk->sk_peer_pid")

from the vfs-brauner tree and commit:

  3f84d577b79d ("af_unix: Inherit sk_flags at connect().")

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/unix/af_unix.c
index 59a64b2ced6e,bd507f74e35e..000000000000
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@@ -1711,10 -1627,12 +1705,12 @@@ restart
  	/* The way is open! Fastly set all the necessary fields... */
  
  	sock_hold(sk);
- 	unix_peer(newsk)	= sk;
- 	newsk->sk_state		= TCP_ESTABLISHED;
- 	newsk->sk_type		= sk->sk_type;
+ 	unix_peer(newsk) = sk;
+ 	newsk->sk_state = TCP_ESTABLISHED;
+ 	newsk->sk_type = sk->sk_type;
+ 	newsk->sk_scm_recv_flags = other->sk_scm_recv_flags;
 -	init_peercred(newsk);
 +	init_peercred(newsk, &peercred);
+ 
  	newu = unix_sk(newsk);
  	newu->listener = other;
  	RCU_INIT_POINTER(newsk->sk_wq, &newu->peer_wq);

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

linux-next: manual merge of the net-next tree with the vfs-brauner tree

[Stephen Rothwell]

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

linux-next: manual merge of the net-next tree with the vfs-brauner tree

[Stephen Rothwell]

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

Hi all,

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

  fs/eventpoll.c

between commit:

  d3a194d95fc8 ("epoll: simplify ep_busy_loop by removing always 0 argument")

from the vfs-brauner tree and commit:

  b9d752105e5f ("net: use napi_id_valid helper")

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 fs/eventpoll.c
index 9b06a0ab9c32,2fecf66661e9..000000000000
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@@ -447,8 -447,8 +447,8 @@@ static bool ep_busy_loop(struct eventpo
  	if (!budget)
  		budget = BUSY_POLL_BUDGET;
  
- 	if (napi_id >= MIN_NAPI_ID && ep_busy_loop_on(ep)) {
+ 	if (napi_id_valid(napi_id) && ep_busy_loop_on(ep)) {
 -		napi_busy_loop(napi_id, nonblock ? NULL : ep_busy_loop_end,
 +		napi_busy_loop(napi_id, ep_busy_loop_end,
  			       ep, prefer_busy_poll, budget);
  		if (ep_events_available(ep))
  			return true;

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

Re: linux-next: manual merge of the net-next tree with the vfs-brauner tree

[Lin Feng]

On 2/28/25 10:29, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   fs/eventpoll.c
> 
> between commit:
> 
>   d3a194d95fc8 ("epoll: simplify ep_busy_loop by removing always 0 argument")
> 
> from the vfs-brauner tree and commit:
> 
>   b9d752105e5f ("net: use napi_id_valid helper")
> 
> 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.
> 

Hi Stephen,

The conflict fix looks good to me, thanks for handling this!

linfeng