Merge branch 'mlx' into merge-test

diff --cc drivers/infiniband/core/uverbs_main.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_device.h
index d4f0fce98587fb38fa6b5c4e4f88267fba7dc0d7,470615f7b5176a89356178239b8973e4dca6656d..1a6cb5d7a0dde2dacd2058cda42ad9ed60176108
--- 1/drivers/infiniband/hw/hns/hns_roce_device.h
--- 2/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@@ -684,10 -665,10 +684,11 @@@ void hns_roce_cleanup_bitmap(struct hns
  int hns_roce_bitmap_alloc_range(struct hns_roce_bitmap *bitmap, int cnt,
                                int align, unsigned long *obj);
  void hns_roce_bitmap_free_range(struct hns_roce_bitmap *bitmap,
 -                              unsigned long obj, int cnt);
 +                              unsigned long obj, int cnt,
 +                              int rr);
  
- struct ib_ah *hns_roce_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
+ struct ib_ah *hns_roce_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
+                                struct ib_udata *udata);
  int hns_roce_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr);
  int hns_roce_destroy_ah(struct ib_ah *ah);
  

diff --cc drivers/infiniband/hw/i40iw/i40iw_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/mad.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
index 1b54786d13d0938692543677835779e74e8368f0,4a67ffc1ddfbd4bb5610a82dc9037b16efbe7365..6c61cf9a16a689da3c2a8f07523fbf9b94d1ed63
--- 1/drivers/infiniband/hw/mlx4/main.c
--- 2/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@ -2814,17 -2817,25 +2817,22 @@@ static void *mlx4_ib_add(struct mlx4_de
                        kmalloc(BITS_TO_LONGS(ibdev->steer_qpn_count) *
                                sizeof(long),
                                GFP_KERNEL);
 -              if (!ibdev->ib_uc_qpns_bitmap) {
 -                      dev_err(&dev->persist->pdev->dev,
 -                              "bit map alloc failed\n");
 +              if (!ibdev->ib_uc_qpns_bitmap)
                        goto err_steer_qp_release;
 -              }
  
-               bitmap_zero(ibdev->ib_uc_qpns_bitmap, ibdev->steer_qpn_count);
- 
-               err = mlx4_FLOW_STEERING_IB_UC_QP_RANGE(
-                               dev, ibdev->steer_qpn_base,
-                               ibdev->steer_qpn_base +
-                               ibdev->steer_qpn_count - 1);
-               if (err)
-                       goto err_steer_free_bitmap;
+               if (dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_DMFS_IPOIB) {
+                       bitmap_zero(ibdev->ib_uc_qpns_bitmap,
+                                   ibdev->steer_qpn_count);
+                       err = mlx4_FLOW_STEERING_IB_UC_QP_RANGE(
+                                       dev, ibdev->steer_qpn_base,
+                                       ibdev->steer_qpn_base +
+                                       ibdev->steer_qpn_count - 1);
+                       if (err)
+                               goto err_steer_free_bitmap;
+               } else {
+                       bitmap_fill(ibdev->ib_uc_qpns_bitmap,
+                                   ibdev->steer_qpn_count);
+               }
        }
  
        for (j = 1; j <= ibdev->dev->caps.num_ports; j++)

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

diff --cc drivers/infiniband/hw/nes/nes_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_cm.c
Simple merge