Skip to content
Commit 5f004bca authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 4251f631 6995e2de
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment