projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e123d9 ca1992c)
Merge branch 'mlx5_vdpa' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Sun, 12 Jan 2020 23:46:19 +0000 (19:46 -0400)
committerJason Gunthorpe <jgg@mellanox.com>
Sun, 12 Jan 2020 23:48:54 +0000 (19:48 -0400)
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


Trivial merge
Domain: System / Kernel;