Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k...

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/mad.c
Simple merge

diff --cc drivers/infiniband/core/user_mad.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
index 06d91e7e4163ce2e0a86424a12b66ceb549f28ef,667df9d423eff1168020bfc6196a66324604b5f7,918814cd0f806f5344e5f293e2bb059010237727,918814cd0f806f5344e5f293e2bb059010237727..c3f654d20038eaab65ee66da2924e7404ced8c52
--- 1/drivers/infiniband/ulp/srp/ib_srp.c
--- 2/drivers/infiniband/ulp/srp/ib_srp.c
--- 3/drivers/infiniband/ulp/srp/ib_srp.c
--- 4/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@@@@ -1919,20 -1930,21 -1929,20 -1929,20 +1920,21 @@@@@ static void srp_handle_qp_err(u64 wr_id
                return;
        }
    
 ---    if (target->connected && !target->qp_in_error) {
 +++    if (ch->connected && !target->qp_in_error) {
                if (wr_id & LOCAL_INV_WR_ID_MASK) {
                        shost_printk(KERN_ERR, target->scsi_host, PFX
- --                                 "LOCAL_INV failed with status %d\n",
- --                                 wc_status);
+ ++                                 "LOCAL_INV failed with status %s (%d)\n",
+ ++                                 ib_wc_status_msg(wc_status), wc_status);
                } else if (wr_id & FAST_REG_WR_ID_MASK) {
                        shost_printk(KERN_ERR, target->scsi_host, PFX
- --                                 "FAST_REG_MR failed status %d\n",
- --                                 wc_status);
+ ++                                 "FAST_REG_MR failed status %s (%d)\n",
+ ++                                 ib_wc_status_msg(wc_status), wc_status);
                } else {
                        shost_printk(KERN_ERR, target->scsi_host,
- --                                 PFX "failed %s status %d for iu %p\n",
+ ++                                 PFX "failed %s status %s (%d) for iu %p\n",
                                     send_err ? "send" : "receive",
- --                                 wc_status, (void *)(uintptr_t)wr_id);
+ ++                                 ib_wc_status_msg(wc_status), wc_status,
+ ++                                 (void *)(uintptr_t)wr_id);
                }
                queue_work(system_long_wq, &target->tl_err_work);
        }

diff --cc include/rdma/ib_verbs.h
Simple merge

diff --cc net/sunrpc/xprtrdma/svc_rdma_transport.c
Simple merge