From: Jason Gunthorpe <jgg@mellanox.com>
Date: Sun, 12 Jan 2020 23:46:19 +0000 (-0400)
Subject: Merge branch 'mlx5_vdpa' into rdma.git for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=aef5570e23dec7b0f7728687c04e7f888766c39e;p=linux.git

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
---

aef5570e23dec7b0f7728687c04e7f888766c39e