Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 5 Aug 2020 22:32:05 +0000 (18:32 -0400)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 5 Aug 2020 22:32:05 +0000 (18:32 -0400)
commit0a9d74d1f01eee0aafd2e98d061ef169fdf138d7
treecd6ef77ede3a3940aa3b7f300e16854beb1b1a76
parent4c05433bc6fb4ae172270f0279be8ba89a3da64f
parent042dd05bddbd84e6a52b337a65d1994003c9b9bb
Merge branch 'mlx5-next' of git://git./linux/kernel/git/mellanox/linux into HEAD

Merge shared code that's necessary for mlx5 vdpa bits to build.

The branch itself includes a small number of patches and is also
independently merged by a couple of other trees.
That shouldn't cause any conflicts by itself.

Saeed Mahameed <saeedm@mellanox.com> says:

---

mlx5-next is a very small branch based on a very early rc that includes
mlx5 shared stuff between rdma and net-next, and now virtio as well.

---

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
include/linux/mlx5/driver.h
include/linux/mlx5/mlx5_ifc.h