diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-11 09:06:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-11 09:06:17 -0800 |
| commit | 0ccd733ac99edc473aaee90c8f6adc346d82befb (patch) | |
| tree | 1fe8f125fd030b7e85138de5721c8cbee441abf9 /tools | |
| parent | Linux 6.12-rc7 (diff) | |
| parent | vdpa/mlx5: Fix error path during device add (diff) | |
| download | wireguard-linux-0ccd733ac99edc473aaee90c8f6adc346d82befb.tar.xz wireguard-linux-0ccd733ac99edc473aaee90c8f6adc346d82befb.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Several small bugfixes all over the place"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vdpa/mlx5: Fix error path during device add
vp_vdpa: fix id_table array not null terminated error
virtio_pci: Fix admin vq cleanup by using correct info pointer
vDPA/ifcvf: Fix pci_read_config_byte() return code handling
Fix typo in vringh_test.c
vdpa: solidrun: Fix UB bug with devres
vsock/virtio: Initialization of the dangling pointer occurring in vsk->trans
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtio/vringh_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/virtio/vringh_test.c b/tools/virtio/vringh_test.c index 43d3a6aa1dcf..b9591223437a 100644 --- a/tools/virtio/vringh_test.c +++ b/tools/virtio/vringh_test.c @@ -519,7 +519,7 @@ int main(int argc, char *argv[]) errx(1, "virtqueue_add_sgs: %i", err); __kmalloc_fake = NULL; - /* Host retreives it. */ + /* Host retrieves it. */ vringh_iov_init(&riov, host_riov, ARRAY_SIZE(host_riov)); vringh_iov_init(&wiov, host_wiov, ARRAY_SIZE(host_wiov)); |