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

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



Linux 5.7-rc6

Conflict in drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
resolved by deleting dr_cq_event, matching how netdev resolved it.

Required for dependencies in the following patches.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents 0ad45e5f b9bbe6ed
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment