diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-05-13 15:54:19 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-05-13 15:54:19 -0300 |
| commit | 10c261551359e37670a200c55c492f4aba7d23ed (patch) | |
| tree | fb23703f18de2df301f6a9471dd4a56893712d5a /include/uapi/rdma | |
| parent | 0cb9e4f9e98af4b969b9140e964c646ad6ed7d40 (diff) | |
| parent | 9254f8ed15b6dcc9b04b9ad32863a7518cc5a5b1 (diff) | |
Merge branch 'mellanox/mlx5-next' into rdma.git for/next
From the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Required for dependencies in following patches
* branch 'mellanox/mlx5-next':
net/mlx5: Add support in forward to namespace
{IB/net}/mlx5: Simplify don't trap code
net/mlx5: Replace zero-length array with flexible-array
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'include/uapi/rdma')
0 files changed, 0 insertions, 0 deletions