From: Doug Ledford <dledford@redhat.com>
Date: Mon, 29 Jul 2019 17:38:42 +0000 (-0400)
Subject: Merge branch 'wip/dl-for-rc' into wip/dl-for-next
X-Git-Tag: v5.4-rc1~91^2~76
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=525a2c651cdd08b19a4c04f63b87e460765220ac;p=linux.git

Merge branch 'wip/dl-for-rc' into wip/dl-for-next

The fix for IB port statistics initialization ("IB/core: Fix querying
total rdma stats") is needed before we take a follow-on patch to
for-next.

Signed-off-by: Doug Ledford <dledford@redhat.com>
---

525a2c651cdd08b19a4c04f63b87e460765220ac
diff --cc drivers/infiniband/core/counters.c
index 9ed7fce85747,45d5164e9574..d60416f0bf3a
--- a/drivers/infiniband/core/counters.c
+++ b/drivers/infiniband/core/counters.c
@@@ -592,9 -595,9 +595,9 @@@ int rdma_counter_get_mode(struct ib_dev
  void rdma_counter_init(struct ib_device *dev)
  {
  	struct rdma_port_counter *port_counter;
 -	u32 port;
 +	u32 port, i;
  
- 	if (!dev->ops.alloc_hw_stats || !dev->port_data)
+ 	if (!dev->port_data)
  		return;
  
  	rdma_for_each_port(dev, port) {