]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite461240c022211372ce7fca2cef8e7e50350e2f2
tree74d879664c964efbf64ee51b5aa5a582fa868635
parentb998e019ad8d69ff394534f0470d891898ae9541
parent59a0f2fe3ef9999c64940f3d3d234b4c0734acd3
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