From: Doug Ledford <dledford@redhat.com>
Date: Wed, 20 May 2015 20:12:40 +0000 (-0400)
Subject: Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' into k... 
X-Git-Tag: v4.14-rc1~5223^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=175e8efe69974e240a89fb3a4bbeeb0b892de10d;p=platform%2Fkernel%2Flinux-rpi.git

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

175e8efe69974e240a89fb3a4bbeeb0b892de10d
diff --cc drivers/infiniband/ulp/srp/ib_srp.c
index 06d91e7,667df9d4,918814c,918814c..c3f654d
--- a/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);
    	}