diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-10 06:42:51 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-10 06:42:51 -1000 |
| commit | ed79cc87302bf7fbc87f05d655b998f866b4fed8 (patch) | |
| tree | cec766af1bf668d2f34fdc7221e4ece20e609691 /include | |
| parent | e33c1b9923775d17ad246946fe67fcb9be288677 (diff) | |
| parent | cf94db21905333e610e479688add629397a4b384 (diff) | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull virtio fixes from Michael Tsirkin:
"Several fixes, add more reviewers to the list"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio: Honour 'may_reduce_num' in vring_create_virtqueue
MAiNTAINERS: add Paolo, Stefan for virtio blk/scsi
virtio_pci: fix a NULL pointer reference in vp_del_vqs
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/virtio_ring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/virtio_ring.h b/include/linux/virtio_ring.h index fab02133a919..3dc70adfe5f5 100644 --- a/include/linux/virtio_ring.h +++ b/include/linux/virtio_ring.h @@ -63,7 +63,7 @@ struct virtqueue; /* * Creates a virtqueue and allocates the descriptor ring. If * may_reduce_num is set, then this may allocate a smaller ring than - * expected. The caller should query virtqueue_get_ring_size to learn + * expected. The caller should query virtqueue_get_vring_size to learn * the actual size of the ring. */ struct virtqueue *vring_create_virtqueue(unsigned int index, |