diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2022-05-24 12:40:28 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-05-24 12:40:28 -0300 |
| commit | a6f844da39af8046798ba5cadf92a0c54da80b26 (patch) | |
| tree | 7ace73f27ac1fe17413415c3a5a79cbb7c1e4855 /drivers/infiniband/hw/hfi1/sdma.c | |
| parent | IB/core: Fix typo in comment (diff) | |
| parent | Linux 5.18 (diff) | |
| download | linux-dev-a6f844da39af8046798ba5cadf92a0c54da80b26.tar.xz linux-dev-a6f844da39af8046798ba5cadf92a0c54da80b26.zip | |
Merge tag 'v5.18' into rdma.git for-next
Following patches have dependencies.
Resolve the merge conflict in
drivers/net/ethernet/mellanox/mlx5/core/main.c by keeping the new names
for the fs functions following linux-next:
https://lore.kernel.org/r/20220519113529.226bc3e2@canb.auug.org.au/
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions