| commit | eafd47fc200ee759c0e8d205b9cc7342bd0f4199 | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@mellanox.com> | Thu May 21 17:07:21 2020 -0300 |
| committer | Jason Gunthorpe <jgg@mellanox.com> | Thu May 21 17:08:27 2020 -0300 |
| tree | 1cbbe6c983c6d00a08270a68ac69a1fa8ce4de8a | |
| parent | 0ad45e5fdc522b26242882abfca1b4b3c840961d [diff] | |
| parent | b9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4ce [diff] |
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: Jason Gunthorpe <jgg@mellanox.com>