OSDN Git Service

Merge branch 'mlx5-next into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Mon, 4 Feb 2019 21:33:02 +0000 (14:33 -0700)
committerJason Gunthorpe <jgg@mellanox.com>
Mon, 4 Feb 2019 21:33:02 +0000 (14:33 -0700)
commite431a80a540960a10bd7de9e866776ba6f0612e6
tree025682236d2e5b1585ce8cd1c4713f919ca74e20
parentda91ddfdc7212e6e716be55a5cf2305ce84a422f
parent46861e3e88be18846971792b763eaf520a91a802
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