Skip to content
  • Linus Torvalds's avatar
    Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · dc92b1f9
    Linus Torvalds authored
    Pull virtio changes from Rusty Russell:
     "New workflow: same git trees pulled by linux-next get sent straight to
      Linus.  Git is awkward at shuffling patches compared with quilt or mq,
      but that doesn't happen often once things get into my -next branch."
    
    * 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (24 commits)
      lguest: fix occasional crash in example launcher.
      virtio-blk: Disable callback in virtblk_done()
      virtio_mmio: Don't attempt to create empty virtqueues
      virtio_mmio: fix off by one error allocating queue
      drivers/virtio/virtio_pci.c: fix error return code
      virtio: don't crash when device is buggy
      virtio: remove CONFIG_VIRTIO_RING
      virtio: add help to CONFIG_VIRTIO option.
      virtio: support reserved vqs
      virtio: introduce an API to set affinity for a virtqueue
      virtio-ring: move queue_index to vring_virtqueue
      virtio_balloon: not EXPERIMENTAL any more.
      virtio-balloon: dependency fix
      virtio-blk: fix NULL checking in virtblk_alloc_req()
      virtio-blk: Add REQ_FLUSH and REQ_FUA support to bio path
      virtio-blk: Add bio-based IO path for virtio-blk
      virtio: console: fix error handling in init() function
      tools: Fix pthread flag for Makefile of trace-agent used by virtio-trace
      tools: Add guest trace agent as a user tool
      virtio/console: Allocate scatterlist according to the current pipe size
      ...
    dc92b1f9