From: David S. Miller <davem@davemloft.net>
Date: Tue, 22 Jul 2014 07:44:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.17-rc1~106^2~111
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8fd90bb889635fa1e7f80a3950948cc2e74c1446;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8fd90bb889635fa1e7f80a3950948cc2e74c1446
diff --cc drivers/infiniband/hw/cxgb4/device.c
index bda949223637,7db82b24302b..f25df5276c22
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@@ -844,16 -696,7 +844,20 @@@ 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);