Merge tag 'v6.4' into rdma.git for-next

Linux 6.4

Resolve conflicts between rdma rc and next in rxe_cq matching linux-next:

drivers/infiniband/sw/rxe/rxe_cq.c:
  https://lore.kernel.org/r/20230622115246.365d30ad@canb.auug.org.au

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

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

diff --cc drivers/infiniband/hw/bnxt_re/bnxt_re.h
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/infiniband/sw/rxe/rxe_cq.c
index 31a25aa,6ca2a05..d5486cb
--- 1/drivers/infiniband/sw/rxe/rxe_cq.c
--- 2/drivers/infiniband/sw/rxe/rxe_cq.c
+++ b/drivers/infiniband/sw/rxe/rxe_cq.c
@@@ -113,11 -113,10 +113,9 @@@ int rxe_cq_post(struct rxe_cq *cq, stru
  
        queue_advance_producer(cq->queue, QUEUE_TYPE_TO_CLIENT);
  
-       spin_unlock_irqrestore(&cq->cq_lock, flags);
- 
 -      if ((cq->notify == IB_CQ_NEXT_COMP) ||
 -          (cq->notify == IB_CQ_SOLICITED && solicited)) {
 +      if ((cq->notify & IB_CQ_NEXT_COMP) ||
 +          (cq->notify & IB_CQ_SOLICITED && solicited)) {
                cq->notify = 0;
 -
                cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.cq_context);
        }
  

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

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

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

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

diff --cc drivers/infiniband/ulp/rtrs/rtrs-clt.c
Simple merge

diff --cc drivers/net/ethernet/microsoft/mana/mana_en.c
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/net/mana/mana.h
Simple merge