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>

diff --cc drivers/infiniband/core/counters.c
index 9ed7fce85747d2445e078a2d7c4448ac42e4f38d,45d5164e9574af247ae3bb53dd63d9791957ae18..d60416f0bf3a2090ede02041ddff49b2b8ebae68
--- 1/drivers/infiniband/core/counters.c
--- 2/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) {

diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/infiniband/hw/qedr/main.c
Simple merge