projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ad45e5 b9bbe6e)
Merge tag 'v5.7-rc6' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Thu, 21 May 2020 20:07:21 +0000 (17:07 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Thu, 21 May 2020 20:08:27 +0000 (17:08 -0300)
commiteafd47fc200ee759c0e8d205b9cc7342bd0f4199
tree1cbbe6c983c6d00a08270a68ac69a1fa8ce4de8atree | snapshot
parent0ad45e5fdc522b26242882abfca1b4b3c840961dcommit | diff
parentb9bbe6ed63b2b9f2c9ee5cbd0f2c946a2723f4cecommit | 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>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/infiniband/core/cm.c diff1 | diff2 | blob | history
drivers/infiniband/core/uverbs_main.c diff1 | diff2 | blob | history
drivers/infiniband/hw/mlx5/qp.c diff1 | diff2 | blob | history
drivers/infiniband/sw/rdmavt/qp.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/health.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history