Subject: linux-next: manual merge of the infiniband tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 16 Jul 2014 13:53:20 +1000

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/cxgb4/device.c between commit 7730b4c7e32c
("cxgb4/iw_cxgb4: work request logging feature") from the net-next tree
and commit 6b54d54dea82 ("RDMA/cxgb4: Initialize the device status
page") from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/infiniband/hw/cxgb4/device.c
index df1f1b52c7ec,7db82b24302b..000000000000
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@@ -843,16 -696,7 +843,17 @@@ static int c4iw_rdev_open(struct c4iw_r
  		pr_err(MOD "error allocating status page\n");
  		goto err4;
  	}
 +	if (c4iw_wr_log) {
 +		rdev->wr_log = kzalloc((1 << c4iw_wr_log_size_order) *
 +				       sizeof(*rdev->wr_log), GFP_KERNEL);
 +		if (rdev->wr_log) {
 +			rdev->wr_log_size = 1 << c4iw_wr_log_size_order;
 +			atomic_set(&rdev->wr_log_idx, 0);
 +		} else {
 +			pr_err(MOD "error allocating wr_log. Logging disabled\n");
 +		}
 +	}
+ 	rdev->status_page->db_off = 0;
  	return 0;
  err4:
  	c4iw_rqtpool_destroy(rdev);