Merge tag 'v5.16' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Thu, 13 Jan 2022 17:21:03 +0000 (13:21 -0400)
committerJason Gunthorpe <jgg@nvidia.com>
Thu, 13 Jan 2022 17:21:03 +0000 (13:21 -0400)
commitc0fe82baaeb2719f910359684c0817057f79a84a
tree74d879664c964efbf64ee51b5aa5a582fa868635
parentc40238e3b8c98993e3c70057f6099e24cc2380f7
parentdf0cc57e057f18e44dac8e6c18aba47ab53202f9
Merge tag 'v5.16' into rdma.git for-next

To resolve minor conflict in:
        drivers/infiniband/hw/mlx5/mlx5_ib.h

By merging both hunks.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
drivers/infiniband/hw/hns/hns_roce_hw_v2.h
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/sw/rxe/rxe_mr.c