projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da91ddf 46861e3)
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)
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


Trivial merge
Linux 6.x block layer and io_uring tree(s)