Jason Gunthorpe 33331a728c 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>

2022-10-06 19:48:45 -03:00

34 KiB

Raw Blame History

View Raw