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)