]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
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)
commitaef5570e23dec7b0f7728687c04e7f888766c39e
tree5b2a2dad691293305b927ba1bf1ad2941bd29a8e
parent1e123d96b85fd41278efc994f8096e1df86fd427
parentca1992c62cadb6c8e1e1b47e197b550f3cd89b76
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