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 Mailing List <linux-kernel@vger•kernel.org>,
Sagi Grimberg <sagig@mellanox•com>,
Anna Schumaker <anna.schumaker@netapp•com>,
Chuck Lever <chuck.lever@oracle•com>,
Devesh Sharma <devesh.sharma@avagotech•com>Devesh Sharma
<devesh.sharma@avagotech•com>
Subject: linux-next: manual merge of the rdma tree with the nfs tree
Date: Wed, 17 Jun 2015 13:17:18 +1000 [thread overview]
Message-ID: <1434511038.24642.2.camel@ellerman.id.au> (raw)
Hi Doug,
Today's linux-next merge of the rdma tree got a conflict in:
net/sunrpc/xprtrdma/frwr_ops.c
between commit:
951e721ca0d6 "xprtrdma: Introduce an FRMR recovery workqueue"
from the nfs tree and commit:
76357c715f32 "xprtrdma, svcrdma: Switch to generic logging helpers"
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/frwr_ops.c
index 661fbc1784ab,d234521320a4..000000000000
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@@ -252,8 -128,8 +252,8 @@@ frwr_sendcompletion(struct ib_wc *wc
/* WARNING: Only wr_id and status are reliable at this point */
r = (struct rpcrdma_mw *)(unsigned long)wc->wr_id;
- pr_warn("RPC: %s: frmr %p flushed, status %d\n",
- __func__, r, wc->status);
- dprintk("RPC: %s: frmr %p (stale), status %s (%d)\n",
++ pr_warn("RPC: %s: frmr %p flushed, status %s (%d)\n",
+ __func__, r, ib_wc_status_msg(wc->status), wc->status);
r->r.frmr.fr_state = FRMR_IS_STALE;
}
next reply other threads:[~2015-06-17 3:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 3:17 Michael Ellerman [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-17 3:19 linux-next: manual merge of the rdma tree with the nfs tree Michael Ellerman
2016-05-19 1:53 Stephen Rothwell
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=1434511038.24642.2.camel@ellerman.id.au \
--to=mpe@ellerman$(echo .)id.au \
--cc=anna.schumaker@netapp$(echo .)com \
--cc=chuck.lever@oracle$(echo .)com \
--cc=devesh.sharma@avagotech$(echo .)com \
--cc=dledford@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sagig@mellanox$(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