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

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