Subject: linux-next: manual merge of the rdma tree with the nfs tree

From: Michael Ellerman <[email-masked]>
Date: Wed, 17 Jun 2015 13:19:25 +1000

Hi Doug,

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

  net/sunrpc/xprtrdma/verbs.c

between commit:

  89e0d11258e9 "xprtrdma: Use ib_device pointer safely"

from the nfs tree and commit:

  8e37210b38fb "IB/core: Change ib_create_cq to use struct ib_cq_init_attr"

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

cheers

diff --cc net/sunrpc/xprtrdma/verbs.c
index 234083560d0e,52df265b472a..000000000000
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@@ -763,9 -692,9 +684,9 @@@ rpcrdma_ep_create(struct rpcrdma_ep *ep
  	init_waitqueue_head(&ep->rep_connect_wait);
  	INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker);
  
+ 	cq_attr.cqe = ep->rep_attr.cap.max_send_wr + 1;
 -	sendcq = ib_create_cq(ia->ri_id->device, rpcrdma_sendcq_upcall,
 -				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
 +	sendcq = ib_create_cq(ia->ri_device, rpcrdma_sendcq_upcall,
- 			      rpcrdma_cq_async_error_upcall, ep,
- 			      ep->rep_attr.cap.max_send_wr + 1, 0);
++			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
  	if (IS_ERR(sendcq)) {
  		rc = PTR_ERR(sendcq);
  		dprintk("RPC:       %s: failed to create send CQ: %i\n",
@@@ -780,9 -709,9 +701,9 @@@
  		goto out2;
  	}
  
+ 	cq_attr.cqe = ep->rep_attr.cap.max_recv_wr + 1;
 -	recvcq = ib_create_cq(ia->ri_id->device, rpcrdma_recvcq_upcall,
 -				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
 +	recvcq = ib_create_cq(ia->ri_device, rpcrdma_recvcq_upcall,
- 			      rpcrdma_cq_async_error_upcall, ep,
- 			      ep->rep_attr.cap.max_recv_wr + 1, 0);
++			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
  	if (IS_ERR(recvcq)) {
  		rc = PTR_ERR(recvcq);
  		dprintk("RPC:       %s: failed to create recv CQ: %i\n",