From: Michael S. Tsirkin Date: Wed, 5 Aug 2020 22:32:05 +0000 (-0400) Subject: Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox... X-Git-Tag: v5.15~3122^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a9d74d1f01eee0aafd2e98d061ef169fdf138d7;p=platform%2Fkernel%2Flinux-starfive.git 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 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 --- 0a9d74d1f01eee0aafd2e98d061ef169fdf138d7