diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-28 12:47:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-28 12:47:22 +0100 |
| commit | 9e5eefba3d098d66defa1ce59a34a41a96f49771 (patch) | |
| tree | 37d0750d3be76112668aa8402f0eff6aeef8f4f8 /include | |
| parent | Linux 5.4-rc5 (diff) | |
| parent | vringh: fix copy direction of vringh_iov_push_kern() (diff) | |
| download | linux-9e5eefba3d098d66defa1ce59a34a41a96f49771.tar.xz linux-9e5eefba3d098d66defa1ce59a34a41a96f49771.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Some minor fixes"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
vringh: fix copy direction of vringh_iov_push_kern()
vsock/virtio: remove unused 'work' field from 'struct virtio_vsock_pkt'
virtio_ring: fix stalls for packed rings
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/virtio_vsock.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h index 4c7781f4b29b..07875ccc7bb5 100644 --- a/include/linux/virtio_vsock.h +++ b/include/linux/virtio_vsock.h @@ -48,7 +48,6 @@ struct virtio_vsock_sock { struct virtio_vsock_pkt { struct virtio_vsock_hdr hdr; - struct work_struct work; struct list_head list; /* socket refcnt not held, only use for cancellation */ struct vsock_sock *vsk; |