linux-next: manual merge of the net-next tree with the rdma tree

[Mark Brown]

Hi all,

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

  drivers/infiniband/sw/rxe/rxe_net.c

between commit:

  d0ee939f7703f ("RDMA/rxe: Support RDMA link creation and destruction per net namespace")

from the net-next tree and commit:

  29ae61b2fe7ee ("drivers: net: drop ipv6_stub usage and use direct function calls")

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.

diff --cc drivers/infiniband/sw/rxe/rxe_net.c
index 211bd3000acc8,cbc646a300035..0000000000000
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@@ -141,9 -138,9 +141,9 @@@ static struct dst_entry *rxe_find_route
  	memcpy(&fl6.daddr, daddr, sizeof(*daddr));
  	fl6.flowi6_proto = IPPROTO_UDP;
  
- 	ndst = ipv6_stub->ipv6_dst_lookup_flow(net,
- 					       rxe_ns_pernet_sk6(net), &fl6,
- 					       NULL);
 -	ndst = ip6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),
 -				   recv_sockets.sk6->sk, &fl6,
++	ndst = ip6_dst_lookup_flow(net, rxe_ns_pernet_sk6(net),
++				   &fl6,
+ 				   NULL);
  	if (IS_ERR(ndst)) {
  		rxe_dbg_qp(qp, "no route to %pI6\n", daddr);
  		return NULL;

Attachment: signature.asc
Description: PGP signature