Merge tag 'v6.0' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Thu, 6 Oct 2022 22:47:03 +0000 (19:47 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Thu, 6 Oct 2022 22:48:45 +0000 (19:48 -0300)
commit33331a728c83f380e53a3dbf2be0c1893da1d739
tree236d3bde9840b641723467018b839c7f37a824ee
parent8ad891ed435ba24465e0650942267e90a060675f
parent4fe89d07dcc2804c8b562f6c7896a45643d34b2f
Merge tag 'v6.0' into rdma.git for-next

Trvial merge conflicts against rdma.git for-rc resolved matching
linux-next:
            drivers/infiniband/hw/hns/hns_roce_hw_v2.c
            drivers/infiniband/hw/hns/hns_roce_main.c

https://lore.kernel.org/r/20220929124005.105149-1-broonie@kernel.org

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
18 files changed:
drivers/infiniband/core/cma.c
drivers/infiniband/core/umem_odp.c
drivers/infiniband/hw/erdma/erdma_qp.c
drivers/infiniband/hw/erdma/erdma_verbs.c
drivers/infiniband/hw/hns/hns_roce_device.h
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
drivers/infiniband/hw/hns/hns_roce_hw_v2.h
drivers/infiniband/hw/hns/hns_roce_main.c
drivers/infiniband/hw/hns/hns_roce_qp.c
drivers/infiniband/hw/irdma/utils.c
drivers/infiniband/hw/irdma/verbs.c
drivers/infiniband/hw/mlx5/mad.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/ulp/rtrs/rtrs-clt.c
drivers/infiniband/ulp/rtrs/rtrs-srv.c
drivers/infiniband/ulp/srp/ib_srp.c
include/linux/mlx5/driver.h