]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
Merge tag 'v7.1-rc5' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Mon, 25 May 2026 16:48:00 +0000 (13:48 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Mon, 25 May 2026 16:48:00 +0000 (13:48 -0300)
commite312f0ff9e180e8ebfdab2419898e82cf5408944
treec670d4dacbf22b65f9c53d4c62937705386f9768
parentb86fd95805a7bd4c5b9465c9e7f75e45bbe7eb6f
parente7ae89a0c97ce2b68b0983cd01eda67cf373517d
Merge tag 'v7.1-rc5' into rdma.git for-next

For dependencies in the following patches

Resolve conflicts, use the goto labels from the rc tag.

* tag 'v7.1-rc5': (1526 commits)

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
14 files changed:
drivers/infiniband/core/addr.c
drivers/infiniband/hw/bnxt_re/ib_verbs.c
drivers/infiniband/hw/hns/hns_roce_qp.c
drivers/infiniband/hw/hns/hns_roce_srq.c
drivers/infiniband/hw/mana/cq.c
drivers/infiniband/hw/mana/main.c
drivers/infiniband/hw/mana/qp.c
drivers/infiniband/hw/mlx4/srq.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
drivers/infiniband/hw/mlx5/umr.c
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c
drivers/infiniband/sw/rxe/rxe_recv.c