Jason Gunthorpe 371bb62158 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: Jason Gunthorpe <jgg@mellanox.com>

2019-06-28 21:18:23 -03:00

568 B

Raw Blame History

View Raw