From: Jason Gunthorpe <jgg@nvidia.com>
Date: Tue, 27 Jun 2023 17:06:29 +0000 (-0300)
Subject: Merge tag 'v6.4' into rdma.git for-next
X-Git-Tag: v6.5-rc1~128^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5f004bcaee4cb552cf1b46a505f18f08777db7e5;p=tomoyo%2Ftomoyo-test1.git

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

5f004bcaee4cb552cf1b46a505f18f08777db7e5
diff --cc drivers/infiniband/sw/rxe/rxe_cq.c
index 31a25aaa44a0,6ca2a05b6a2a..d5486cbb3f10
--- a/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);
  	}