diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2022-10-06 19:47:03 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-10-06 19:48:45 -0300 |
| commit | 33331a728c83f380e53a3dbf2be0c1893da1d739 (patch) | |
| tree | 236d3bde9840b641723467018b839c7f37a824ee /drivers/crypto/git:/ssh:/git@git.zx2c4.com | |
| parent | RDMA/rxe: Remove error/warning messages from packet receiver path (diff) | |
| parent | Linux 6.0 (diff) | |
| download | linux-dev-33331a728c83f380e53a3dbf2be0c1893da1d739.tar.xz linux-dev-33331a728c83f380e53a3dbf2be0c1893da1d739.zip | |
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>
Diffstat (limited to 'drivers/crypto/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions