From: Jason Gunthorpe <jgg@mellanox.com>
Date: Tue, 10 Mar 2020 15:49:09 +0000 (-0300)
Subject: Merge tag 'v5.6-rc5' into rdma.git for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f00a54c2cdc82543d5804b0074821b5a40e577f;p=linux.git

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>
---

6f00a54c2cdc82543d5804b0074821b5a40e577f
diff --cc drivers/infiniband/core/verbs.c
index 13ff4c8bfe5ac,e62c9dfc7837a..610ce9a6c6b9b
--- a/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);