| commit | c0fe82baaeb2719f910359684c0817057f79a84a | [log] [tgz] |
|---|---|---|
| author | Jason Gunthorpe <jgg@nvidia.com> | Thu Jan 13 13:21:03 2022 -0400 |
| committer | Jason Gunthorpe <jgg@nvidia.com> | Thu Jan 13 13:21:03 2022 -0400 |
| tree | 74d879664c964efbf64ee51b5aa5a582fa868635 | |
| parent | c40238e3b8c98993e3c70057f6099e24cc2380f7 [diff] | |
| parent | df0cc57e057f18e44dac8e6c18aba47ab53202f9 [diff] |
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>