Merge tag 'v7.1-rc5' into rdma.git for-next

For dependencies in the following patches

Resolve conflicts, use the goto labels from the rc tag.

* tag 'v7.1-rc5': (1526 commits)

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

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

diff --cc drivers/infiniband/hw/bnxt_re/ib_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_qp.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_srq.c
index 00552a08f21ae2490b8d372f5d2d163bbf7aca78,8b94cbdfa54dfa83f6f2bdf0f28d06d3dbc1430d..4a54394f96bef4ef140fed91e5a7a0da4c31774a
--- 1/drivers/infiniband/hw/hns/hns_roce_srq.c
--- 2/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@@ -473,15 -477,13 +477,11 @@@ int hns_roce_create_srq(struct ib_srq *
        if (udata) {
                resp.cap_flags = srq->cap_flags;
                resp.srqn = srq->srqn;
 -              if (ib_copy_to_udata(udata, &resp,
 -                                   min(udata->outlen, sizeof(resp)))) {
 -                      ret = -EFAULT;
 +              ret = ib_respond_udata(udata, resp);
 +              if (ret)
                        goto err_srqc;
 -              }
        }
  
-       srq->event = hns_roce_ib_srq_event;
-       refcount_set(&srq->refcount, 1);
-       init_completion(&srq->free);
- 
        return 0;
  
  err_srqc:

diff --cc drivers/infiniband/hw/mana/cq.c
Simple merge

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

diff --cc drivers/infiniband/hw/mana/qp.c
index c50a1eafee58c85b16d602e1012cd8e8476cf202,0fbcf449c134b5389a47dee192645f1c5de2b333..39d9cdcc5df45a2cc978e7188c4c9c2faaa620d8
--- 1/drivers/infiniband/hw/mana/qp.c
--- 2/drivers/infiniband/hw/mana/qp.c
+++ b/drivers/infiniband/hw/mana/qp.c
@@@ -210,9 -212,13 +212,9 @@@ static int mana_ib_create_qp_rss(struc
        if (ret)
                goto fail;
  
 -      ret = ib_copy_to_udata(udata, &resp, sizeof(resp));
 -      if (ret) {
 -              ibdev_dbg(&mdev->ib_dev,
 -                        "Failed to copy to udata create rss-qp, %d\n",
 -                        ret);
 +      ret = ib_respond_udata(udata, resp);
 +      if (ret)
-               goto fail;
+               goto err_disable_vport_rx;
 -      }
  
        kfree(mana_ind_table);
  

diff --cc drivers/infiniband/hw/mlx4/srq.c
index 0b4df4f48ca14ff921c71fc5d73b7eeb9cb89152,767840736d583bceb239222a6d511abafbde4dab..dd868f9b893d7020f4397a645a03b3bc844f574f
--- 1/drivers/infiniband/hw/mlx4/srq.c
--- 2/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@@ -191,15 -191,11 +191,15 @@@ int mlx4_ib_create_srq(struct ib_srq *i
        srq->msrq.event = mlx4_ib_srq_event;
        srq->ibsrq.ext.xrc.srq_num = srq->msrq.srqn;
  
 -      if (udata)
 -              if (ib_copy_to_udata(udata, &srq->msrq.srqn, sizeof (__u32))) {
 -                      err = -EFAULT;
 +      if (udata) {
 +              struct mlx4_ib_create_srq_resp uresp = {
 +                      .srqn = srq->msrq.srqn
 +              };
 +
 +              err = ib_respond_udata(udata, uresp);
 +              if (err)
-                       goto err_wrid;
+                       goto err_srq;
 -              }
 +      }
  
        init_attr->attr.max_wr = srq->msrq.max - 1;
  

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

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

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

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
Simple merge

diff --cc drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c
index 69a89f609ada9db1f05970d2d7b21c5c72fa0716,c7c2b41060e5260e6fdc8de9f0ebdd653b5e97e9..b9c3202b9545e386461cdb45ec94ce29cc03aefc
--- 1/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c
--- 2/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c
@@@ -320,11 -320,11 +320,11 @@@ int pvrdma_alloc_ucontext(struct ib_uco
  
        /* copy back to user */
        uresp.qp_tab_size = vdev->dsr->caps.max_qp;
 -      ret = ib_copy_to_udata(udata, &uresp, sizeof(uresp));
 +      ret = ib_respond_udata(udata, uresp);
        if (ret) {
-               pvrdma_uar_free(vdev, &context->uar);
+               /* pvrdma_dealloc_ucontext() also frees the UAR */
                pvrdma_dealloc_ucontext(&context->ibucontext);
 -              return -EFAULT;
 +              return ret;
        }
  
        return 0;

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