From: Michael Ellerman <mpe@ellerman•id.au>
To: Doug Ledford <dledford@redhat•com>,
Trond Myklebust <trond.myklebust@fys•uio.no>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Matan Barak <matanb@mellanox•com>,
Or Gerlitz <ogerlitz@mellanox•com>,
Chuck Lever <chuck.lever@oracle•com>,
Steve Wise <swise@opengridcomputing•com>,
Devesh Sharma <"devesh.sha rma"@avagotech.com>,
Anna Schumaker <Anna.Schumaker@Netapp•com>
Subject: linux-next: manual merge of the rdma tree with the nfs tree
Date: Wed, 17 Jun 2015 13:19:25 +1000 [thread overview]
Message-ID: <1434511165.24642.4.camel@ellerman.id.au> (raw)
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",
next reply other threads:[~2015-06-17 3:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 3:19 Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-05-19 1:53 linux-next: manual merge of the rdma tree with the nfs tree Stephen Rothwell
2015-06-17 3:17 Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434511165.24642.4.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc="devesh.sha rma"@avagotech.com \
--cc=Anna.Schumaker@Netapp$(echo .)com \
--cc=chuck.lever@oracle$(echo .)com \
--cc=dledford@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matanb@mellanox$(echo .)com \
--cc=ogerlitz@mellanox$(echo .)com \
--cc=swise@opengridcomputing$(echo .)com \
--cc=trond.myklebust@fys$(echo .)uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox