diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-20 17:07:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-20 17:07:50 -0700 |
| commit | 7f063b2f17eaba2a35e251aa53627f2a70d536e2 (patch) | |
| tree | 82676aefc15baa911c835e69c840184ee45607c7 /tools | |
| parent | a625b2a387628df94e385faf5c81bf252f304ed9 (diff) | |
| parent | b282418bc366194677eafd1dad180d92254586ac (diff) | |
| download | linux-7f063b2f17eaba2a35e251aa53627f2a70d536e2.tar.gz linux-7f063b2f17eaba2a35e251aa53627f2a70d536e2.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull vhost,vdpa,virtio updates from Michael Tsirkin:
- transport v3 support in virtio-mmio
- suspend support in vduse
- fixes, cleanups all over the place
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (54 commits)
vduse: Add suspend
vduse: do not take rwsem at reset work flush
vduse: add F_QUEUE_READY feature
vduse: add VDUSE_SET_FEATURES ioctl
vduse: add VDUSE_GET_FEATURES ioctl
vduse: store control device pointer
tools/virtio: Fix control typo in trace agent comment
tools/virtio: Fix userspace typo in vringh test comment
vhost: reject zero-size IOTLB INVALIDATE
vdpa: Remove redundant dev_err()
virtio_ring: fix infinite loop in virtnet_poll_cleantx when device is broken
vdpa/mlx5: roll back MR update after VQ setup failure
MAINTAINERS: remove Gabriel from LiteX and fw-cfg drivers
virtio_mem: fix typo in comment
vdpa/solidrun: fix typos in snet_ctrl comments
virtio: fix article before virtio in dma-buf comment
vhost: fix inaccurate kdoc in iotlb helpers
virtio: rtc: time out alarm requests
vdpa/mlx5: fix wrong MLX5_ADDR_OF struct type in alloc_inout()
vdpa: octeon_ep: add missing MODULE_DEVICE_TABLE()
...
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/virtio/vhost_net_test.c | 5 | ||||
| -rw-r--r-- | tools/virtio/virtio-trace/trace-agent-ctl.c | 2 | ||||
| -rw-r--r-- | tools/virtio/vringh_test.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/tools/virtio/vhost_net_test.c b/tools/virtio/vhost_net_test.c index 389d99a6d7c7..566e15420bb6 100644 --- a/tools/virtio/vhost_net_test.c +++ b/tools/virtio/vhost_net_test.c @@ -451,11 +451,6 @@ static const struct option longopts[] = { .has_arg = required_argument, }, { - .name = "batch", - .val = 'b', - .has_arg = required_argument, - }, - { } }; diff --git a/tools/virtio/virtio-trace/trace-agent-ctl.c b/tools/virtio/virtio-trace/trace-agent-ctl.c index 39860be6e2d8..9577579e86da 100644 --- a/tools/virtio/virtio-trace/trace-agent-ctl.c +++ b/tools/virtio/virtio-trace/trace-agent-ctl.c @@ -84,7 +84,7 @@ error: } /* - * contol read/write threads by handling global_run_operation + * control read/write threads by handling global_run_operation */ void *rw_ctl_loop(int ctl_fd) { diff --git a/tools/virtio/vringh_test.c b/tools/virtio/vringh_test.c index 5ea6d29bc992..84961b9ab5ff 100644 --- a/tools/virtio/vringh_test.c +++ b/tools/virtio/vringh_test.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Simple test of virtio code, entirely in userpsace. */ +/* Simple test of virtio code, entirely in userspace. */ #define _GNU_SOURCE #include <sched.h> #include <err.h> |