History

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull virtio update from Rusty Russell: "Some nice cleanups, and even a patch my wife did as a "live" demo for Latinoware 2012. There's a slightly non-trivial merge in virtio-net, as we cleaned up the virtio add_buf interface while DaveM accepted the mq virtio-net patches." * tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (27 commits) virtio_console: Add support for remoteproc serial virtio_console: Merge struct buffer_token into struct port_buffer virtio: add drv_to_virtio to make code clearly virtio: use dev_to_virtio wrapper in virtio virtio-mmio: Fix irq parsing in command line parameter virtio_console: Free buffers from out-queue upon close virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>( virtio_console: Use kmalloc instead of kzalloc virtio_console: Free buffer if splice fails virtio: tools: make it clear that virtqueue_add_buf() no longer returns > 0 virtio: scsi: make it clear that virtqueue_add_buf() no longer returns > 0 virtio: rpmsg: make it clear that virtqueue_add_buf() no longer returns > 0 virtio: net: make it clear that virtqueue_add_buf() no longer returns > 0 virtio: console: make it clear that virtqueue_add_buf() no longer returns > 0 virtio: make virtqueue_add_buf() returning 0 on success, not capacity. virtio: console: don't rely on virtqueue_add_buf() returning capacity. virtio_net: don't rely on virtqueue_add_buf() returning capacity. virtio-net: remove unused skb_vnet_hdr->num_sg field virtio-net: correct capacity math on ring full virtio: move queue_index and num_free fields into core struct virtqueue. ...

Linus Torvalds committed 13 years ago

Commit b7dfde92 parents 03c850e 1b6370417 files · +412 −276Browse files

Showing the changes to include/uapi/linux (1 of 17 files). Show all

Unified · Split

include/uapi/linux/virtio_ids.h+1−0
@@ -37,5 +37,6 @@ · 36 unmodified lines
3737 #define VIRTIO_ID_RPMSG 7 /* virtio remote processor messaging */
3838 #define VIRTIO_ID_SCSI 8 /* virtio scsi */
3939 #define VIRTIO_ID_9P 9 /* 9p virtio console */
40+#define VIRTIO_ID_RPROC_SERIAL 11 /* virtio remoteproc serial link */
4041
4142 #endif /* _LINUX_VIRTIO_IDS_H */