Jason Gunthorpe a6f844da39 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>

2022-05-24 12:40:28 -03:00

59 KiB

Raw Blame History

View Raw