linux-kernel - linux-next: manual merge of the rdma tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20230622115246.365d30ad@canb.auug.org.au>
Date:   Thu, 22 Jun 2023 11:52:46 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Doug Ledford <dledford@...hat.com>,
        Jason Gunthorpe <jgg@...lanox.com>
Cc:     Bob Pearson <rpearsonhpe@...il.com>,
        Jason Gunthorpe <jgg@...dia.com>,
        Jason Gunthorpe <jgg@...pe.ca>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the rdma tree with Linus' tree

Hi all,

Today's linux-next merge of the rdma tree got a conflict in:

  drivers/infiniband/sw/rxe/rxe_cq.c

between commit:

  0c7e314a6352 ("RDMA/rxe: Fix rxe_cq_post")

from the origin tree and commit:

  350b6dd4b2f8 ("RDMA/rxe: Simplify cq->notify code")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/infiniband/sw/rxe/rxe_cq.c
index 6ca2a05b6a2a,31a25aaa44a0..000000000000
--- a/drivers/infiniband/sw/rxe/rxe_cq.c
+++ b/drivers/infiniband/sw/rxe/rxe_cq.c
@@@ -113,10 -113,11 +113,9 @@@ int rxe_cq_post(struct rxe_cq *cq, stru
  
  	queue_advance_producer(cq->queue, QUEUE_TYPE_TO_CLIENT);
  
- 	if ((cq->notify == IB_CQ_NEXT_COMP) ||
- 	    (cq->notify == IB_CQ_SOLICITED && solicited)) {
 -	spin_unlock_irqrestore(&cq->cq_lock, flags);
 -
+ 	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);
  	}
  

Content of type "application/pgp-signature" skipped