Skip to content
Commit 33331a72 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarJason Gunthorpe <jgg@nvidia.com>
parents 8ad891ed 4fe89d07
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment