projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4251f63 6995e2d)
Merge tag 'v6.4' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 27 Jun 2023 17:06:29 +0000 (14:06 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 27 Jun 2023 17:06:29 +0000 (14:06 -0300)
commit5f004bcaee4cb552cf1b46a505f18f08777db7e5
treec81bdd8e01ba8de9862c8bdb1b210559d4bcf154tree | snapshot
parent4251f631fdfba0b38e4634510c5950ee157cc069commit | diff
parent6995e2de6891c724bfeb2db33d7b87775f913ad1commit | diff
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>
20 files changed:
drivers/infiniband/core/cma.c diff1 | diff2 | blob | history
drivers/infiniband/hw/bnxt_re/bnxt_re.h diff1 | diff2 | blob | history
drivers/infiniband/hw/bnxt_re/ib_verbs.c diff1 | diff2 | blob | history
drivers/infiniband/hw/bnxt_re/main.c diff1 | diff2 | blob | history
drivers/infiniband/hw/bnxt_re/qplib_fp.c diff1 | diff2 | blob | history
drivers/infiniband/hw/bnxt_re/qplib_res.c diff1 | diff2 | blob | history
drivers/infiniband/hw/bnxt_re/qplib_sp.c diff1 | diff2 | blob | history
drivers/infiniband/hw/hns/hns_roce_hw_v2.c diff1 | diff2 | blob | history
drivers/infiniband/hw/irdma/verbs.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/mlx5_ib.h diff1 | diff2 | blob | history
drivers/infiniband/sw/rxe/rxe_comp.c diff1 | diff2 | blob | history
drivers/infiniband/sw/rxe/rxe_cq.c diff1 | diff2 | blob | history
drivers/infiniband/sw/rxe/rxe_qp.c diff1 | diff2 | blob | history
drivers/infiniband/sw/rxe/rxe_req.c diff1 | diff2 | blob | history
drivers/infiniband/sw/rxe/rxe_resp.c diff1 | diff2 | blob | history
drivers/infiniband/sw/rxe/rxe_verbs.c diff1 | diff2 | blob | history
drivers/infiniband/ulp/rtrs/rtrs-clt.c diff1 | diff2 | blob | history
drivers/net/ethernet/microsoft/mana/mana_en.c diff1 | diff2 | blob | history
include/linux/mlx5/driver.h diff1 | diff2 | blob | history
include/net/mana/mana.h diff1 | diff2 | blob | history
MicroBlaze GIT Repository