Messages in this thread | | | Date | Wed, 13 May 2015 13:05:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the net tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in net/core/net_namespace.c between commit e3d8ecb70e16 ("netns: return RTM_NEWNSID instead of RTM_GETNSID on a get") from the net tree and commit cab3c8ec8d57 ("netns: always provide the id to rtnl_net_fill()") from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/core/net_namespace.c index 572af0011997,a665bf490c88..000000000000 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c @@@ -600,8 -639,9 +639,9 @@@ static int rtnl_net_getid(struct sk_buf goto out; } + id = peernet2id(net, peer); err = rtnl_net_fill(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq, 0, - RTM_NEWNSID, net, peer, -1); - RTM_GETNSID, net, id); ++ RTM_NEWNSID, net, id); if (err < 0) goto err_out; [unhandled content-type:application/pgp-signature] | |