| commit | 33331a728c83f380e53a3dbf2be0c1893da1d739 | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@nvidia.com> | Thu Oct 06 19:47:03 2022 -0300 |
| committer | Jason Gunthorpe <jgg@nvidia.com> | Thu Oct 06 19:48:45 2022 -0300 |
| tree | 236d3bde9840b641723467018b839c7f37a824ee | |
| parent | 8ad891ed435ba24465e0650942267e90a060675f [diff] | |
| parent | 4fe89d07dcc2804c8b562f6c7896a45643d34b2f [diff] |
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>