diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 20:21:03 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-01-13 20:21:03 +0300 |
| commit | c0fe82baaeb2719f910359684c0817057f79a84a (patch) | |
| tree | 74d879664c964efbf64ee51b5aa5a582fa868635 /include/uapi/rdma | |
| parent | c40238e3b8c98993e3c70057f6099e24cc2380f7 (diff) | |
| parent | df0cc57e057f18e44dac8e6c18aba47ab53202f9 (diff) | |
| download | linux-c0fe82baaeb2719f910359684c0817057f79a84a.tar.xz | |
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>
Diffstat (limited to 'include/uapi/rdma')
0 files changed, 0 insertions, 0 deletions