diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-01-12 19:46:19 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-01-12 19:48:54 -0400 |
| commit | aef5570e23dec7b0f7728687c04e7f888766c39e (patch) | |
| tree | 5b2a2dad691293305b927ba1bf1ad2941bd29a8e /drivers/infiniband | |
| parent | 1e123d96b85fd41278efc994f8096e1df86fd427 (diff) | |
| parent | ca1992c62cadb6c8e1e1b47e197b550f3cd89b76 (diff) | |
| download | linux-aef5570e23dec7b0f7728687c04e7f888766c39e.tar.bz2 | |
Merge branch 'mlx5_vdpa' into rdma.git for-next
From the mlx5-next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Merged due to dependencies in the next patches.
* branch 'mlx5_vdpa':
net/mlx5: Expose vDPA emulation device capabilities
net/mlx5: Add Virtio Emulation related device capabilities
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions