Merge branches 'misc', 'qedr', 'reject-helpers', 'rxe' and 'srp' into merge-test

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

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

diff --cc drivers/infiniband/hw/hfi1/mad.c
index 0ef62e67f283731caf77af9a0a42acad7428bda7,320e4daa5fc6cdf83000a607e3e29edd55ff8b2f,9487c9bb892087d4dd3b994576fa2eaec2db7d0e,9487c9bb892087d4dd3b994576fa2eaec2db7d0e,9487c9bb892087d4dd3b994576fa2eaec2db7d0e,9487c9bb892087d4dd3b994576fa2eaec2db7d0e..6e595afca24cfb7ba8cf3c9a20842a7d51fb3c07
--- 1/drivers/infiniband/hw/hfi1/mad.c
--- 2/drivers/infiniband/hw/hfi1/mad.c
--- 3/drivers/infiniband/hw/hfi1/mad.c
--- 4/drivers/infiniband/hw/hfi1/mad.c
--- 5/drivers/infiniband/hw/hfi1/mad.c
--- 6/drivers/infiniband/hw/hfi1/mad.c
+++ b/drivers/infiniband/hw/hfi1/mad.c
@@@@@@@ -342,9 -341,9 -341,9 -341,9 -341,9 -341,9 +342,9 @@@@@@@ static int __subn_get_opa_nodeinfo(stru
                return reply((struct ib_mad_hdr *)smp);
        }
      
 -----  ni->port_guid = cpu_to_be64(dd->pport[pidx].guid);
 +++++  ni->port_guid = get_sguid(to_iport(ibdev, port), HFI1_PORT_GUID_INDEX);
        ni->base_version = OPA_MGMT_BASE_VERSION;
- ----  ni->class_version = OPA_SMI_CLASS_VERSION;
+ ++++  ni->class_version = OPA_SM_CLASS_VERSION;
        ni->node_type = 1;     /* channel adapter */
        ni->num_ports = ibdev->phys_port_cnt;
        /* This is already in network order */
@@@@@@@ -373,15 -373,13 -373,13 -373,13 -373,13 -373,13 +373,15 @@@@@@@ static int subn_get_nodeinfo(struct ib_
      
        /* GUID 0 is illegal */
        if (smp->attr_mod || pidx >= dd->num_pports ||
 -----      dd->pport[pidx].guid == 0)
 +++++      ibdev->node_guid == 0 ||
 +++++      get_sguid(to_iport(ibdev, port), HFI1_PORT_GUID_INDEX) == 0) {
                smp->status |= IB_SMP_INVALID_FIELD;
 -----  else
 -----          nip->port_guid = cpu_to_be64(dd->pport[pidx].guid);
 +++++          return reply((struct ib_mad_hdr *)smp);
 +++++  }
      
 +++++  nip->port_guid = get_sguid(to_iport(ibdev, port), HFI1_PORT_GUID_INDEX);
        nip->base_version = OPA_MGMT_BASE_VERSION;
- ----  nip->class_version = OPA_SMI_CLASS_VERSION;
+ ++++  nip->class_version = OPA_SM_CLASS_VERSION;
        nip->node_type = 1;     /* channel adapter */
        nip->num_ports = ibdev->phys_port_cnt;
        /* This is already in network order */

diff --cc drivers/infiniband/hw/mlx4/main.c
index 6c61cf9a16a689da3c2a8f07523fbf9b94d1ed63,a87c395e185aff536d1e60f837a9626114903457,b597e822759139f2de50c70dc41394e2a93998ab,b597e822759139f2de50c70dc41394e2a93998ab,b597e822759139f2de50c70dc41394e2a93998ab,b597e822759139f2de50c70dc41394e2a93998ab..c8413fc120e632bd9a6677c17507f3c454855d16
--- 1/drivers/infiniband/hw/mlx4/main.c
--- 2/drivers/infiniband/hw/mlx4/main.c
--- 3/drivers/infiniband/hw/mlx4/main.c
--- 4/drivers/infiniband/hw/mlx4/main.c
--- 5/drivers/infiniband/hw/mlx4/main.c
--- 6/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@@@@@ -2817,22 -2815,20 -2814,20 -2814,20 -2814,20 -2814,20 +2818,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);
      
  ----          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/ocrdma/ocrdma_hw.c
Simple merge

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

diff --cc drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
Simple merge

diff --cc drivers/infiniband/hw/usnic/usnic_ib_verbs.c
Simple merge

diff --cc drivers/infiniband/sw/rxe/rxe_verbs.c
Simple merge

diff --cc drivers/infiniband/ulp/isert/ib_isert.c
Simple merge