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

Merge tag 'v5.2-rc6' into rdma.git for-next



For dependencies in next patches.

Resolve conflicts:
- Use uverbs_get_cleared_udata() with new cq allocation flow
- Continue to delete nes despite SPDX conflict
- Resolve list appends in mlx5_command_str()
- Use u16 for vport_rule stuff
- Resolve list appends in struct ib_client

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents 10dcc744 4b972a01
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment