diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-11 23:10:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-11 23:10:23 +0200 |
| commit | 6da7e95326976c0bee625f642e1c8ffa970efa07 (patch) | |
| tree | a7e61e93661331fe3114328bd81a9113285436f2 /include | |
| parent | Merge tag 'ceph-for-4.8-rc2' of https://github.com/ceph/ceph-client (diff) | |
| parent | virtio/s390: deprecate old transport (diff) | |
| download | linux-6da7e95326976c0bee625f642e1c8ffa970efa07.tar.xz linux-6da7e95326976c0bee625f642e1c8ffa970efa07.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio/vhost fixes and cleanups from Michael Tsirkin:
"Misc fixes and cleanups all over the place"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio/s390: deprecate old transport
virtio/s390: keep early_put_chars
virtio_blk: Fix a slient kernel panic
virtio-vsock: fix include guard typo
vhost/vsock: fix vhost virtio_vsock_pkt use-after-free
9p/trans_virtio: use kvfree() for iov_iter_get_pages_alloc()
virtio: fix error handling for debug builds
virtio: fix memory leak in virtqueue_add()
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/virtio_vsock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h index 6b011c19b50f..1d57ed3d84d2 100644 --- a/include/uapi/linux/virtio_vsock.h +++ b/include/uapi/linux/virtio_vsock.h @@ -32,7 +32,7 @@ */ #ifndef _UAPI_LINUX_VIRTIO_VSOCK_H -#define _UAPI_LINUX_VIRTIO_VOSCK_H +#define _UAPI_LINUX_VIRTIO_VSOCK_H #include <linux/types.h> #include <linux/virtio_ids.h> |