Merge tag 'v5.6-rc5' into rdma.git for-next

Required due to dependencies in following patches.

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

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

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

diff --cc drivers/infiniband/core/verbs.c
index 13ff4c8bfe5ac784b8db96f30051039c3606816c,e62c9dfc7837a86b5a1fdfb7101e5ee0d54c79f7..610ce9a6c6b9bb42326fea1132505733893d2ac3
--- 1/drivers/infiniband/core/verbs.c
--- 2/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@@ -1193,19 -1185,9 +1193,9 @@@ struct ib_qp *ib_create_qp(struct ib_p
        if (ret)
                goto err;
  
-       qp->qp_type    = qp_init_attr->qp_type;
-       qp->rwq_ind_tbl = qp_init_attr->rwq_ind_tbl;
- 
-       atomic_set(&qp->usecnt, 0);
-       qp->mrs_used = 0;
-       spin_lock_init(&qp->mr_lock);
-       INIT_LIST_HEAD(&qp->rdma_mrs);
-       INIT_LIST_HEAD(&qp->sig_mrs);
-       qp->port = 0;
- 
        if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) {
                struct ib_qp *xrc_qp =
 -                      create_xrc_qp_user(qp, qp_init_attr, udata);
 +                      create_xrc_qp_user(qp, qp_init_attr);
  
                if (IS_ERR(xrc_qp)) {
                        ret = PTR_ERR(xrc_qp);

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