]> www.infradead.org Git - users/hch/misc.git/commit
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 02:37:27 +0000 (12:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 May 2025 02:37:27 +0000 (12:37 +1000)
commit34c8b507d2b64e7b2e90fe7e0b8e2f9a4373aa8c
treeca047b6870562ed324e9ea99f1e80be8f19a13bd
parent16e29fe4a1e720e805ce17d99d40b064b472a765
parente56b4eab9cde7db525bf8dc57b489d157d5a201e
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

# Conflicts:
# drivers/infiniband/sw/rxe/rxe_mr.c
# drivers/infiniband/sw/rxe/rxe_resp.c
drivers/infiniband/core/cma.c
drivers/infiniband/hw/hns/hns_roce_main.c
drivers/infiniband/sw/rxe/rxe_loc.h
drivers/infiniband/sw/rxe/rxe_mr.c
drivers/infiniband/sw/rxe/rxe_resp.c
include/rdma/ib_verbs.h