diff options
author | Jason Gunthorpe <jgg@mellanox.com> | 2019-02-04 14:33:02 -0700 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-02-04 14:33:02 -0700 |
commit | e431a80a540960a10bd7de9e866776ba6f0612e6 (patch) | |
tree | 025682236d2e5b1585ce8cd1c4713f919ca74e20 /drivers/infiniband | |
parent | da91ddfdc7212e6e716be55a5cf2305ce84a422f (diff) | |
parent | 46861e3e88be18846971792b763eaf520a91a802 (diff) | |
download | blackbird-op-linux-e431a80a540960a10bd7de9e866776ba6f0612e6.tar.gz blackbird-op-linux-e431a80a540960a10bd7de9e866776ba6f0612e6.zip |
Merge branch 'mlx5-next into rdma.git for-next
From
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
For dependencies needed in the next ODP patches.
* branch 'mlx5-next':
net/mlx5: Set ODP SRQ support in firmware
net/mlx5: Add XRC transport to ODP device capabilities layout
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions