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>
This commit is contained in:
@@ -2585,6 +2585,7 @@ struct ib_client {
|
||||
const char *name;
|
||||
void (*add) (struct ib_device *);
|
||||
void (*remove)(struct ib_device *, void *client_data);
|
||||
void (*rename)(struct ib_device *dev, void *client_data);
|
||||
int (*get_nl_info)(struct ib_device *ibdev, void *client_data,
|
||||
struct ib_client_nl_info *res);
|
||||
int (*get_global_nl_info)(struct ib_client_nl_info *res);
|
||||
|
Reference in New Issue
Block a user