diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2020-08-06 00:32:05 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2020-08-06 00:32:05 +0200 |
| commit | 0a9d74d1f01eee0aafd2e98d061ef169fdf138d7 (patch) | |
| tree | cd6ef77ede3a3940aa3b7f300e16854beb1b1a76 /kernel/watchdog.c | |
| parent | vDPA: dont change vq irq after DRIVER_OK (diff) | |
| parent | RDMA/mlx5: ConnectX-7 new capabilities to set relaxed ordering by UMR (diff) | |
| download | linux-0a9d74d1f01eee0aafd2e98d061ef169fdf138d7.tar.xz linux-0a9d74d1f01eee0aafd2e98d061ef169fdf138d7.zip | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions