]> 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)
commit2f3173263a251a0092f1505607d2d9f17461d14f
tree74d879664c964efbf64ee51b5aa5a582fa868635
parenta569fc256c5c457905996bda76262f41815d0f0a
parent416c5e2061be25d771057476fa74f2d0c3351836
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