Merge tag 'v5.13-rc7' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 22 Jun 2021 17:42:52 +0000 (14:42 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 22 Jun 2021 17:43:51 +0000 (14:43 -0300)
commitfdcebbc2ac2cfd82a18857b0c85067fa7e8f5233
treee21b6d503468282cd9010d24b35327dc8d772980
parent6d33cabf2baf304730d01a942095416b3a8329ab
parent13311e74253fe64329390df80bed3f07314ddd61
Merge tag 'v5.13-rc7' into rdma.git for-next

Linux 5.13-rc7

Needed for dependencies in following patches. Merge conflict in rxe_cmop.c
resolved by compining both patches.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
13 files changed:
MAINTAINERS
drivers/infiniband/core/uverbs_cmd.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx5/cq.c
drivers/infiniband/hw/mlx5/doorbell.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mr.c
drivers/infiniband/sw/rxe/rxe_comp.c
drivers/infiniband/sw/rxe/rxe_qp.c
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_hw_autogen.h
drivers/net/ethernet/intel/ice/ice_lib.c
drivers/net/ethernet/intel/ice/ice_main.c