Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
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 ...
No related branches found
No related tags found
Showing
- arch/s390/Kconfig 0 additions, 1 deletionarch/s390/Kconfig
- arch/x86/lguest/Kconfig 0 additions, 1 deletionarch/x86/lguest/Kconfig
- drivers/block/virtio_blk.c 269 additions, 37 deletionsdrivers/block/virtio_blk.c
- drivers/char/virtio_console.c 178 additions, 20 deletionsdrivers/char/virtio_console.c
- drivers/lguest/lguest_device.c 4 additions, 1 deletiondrivers/lguest/lguest_device.c
- drivers/remoteproc/remoteproc_virtio.c 4 additions, 1 deletiondrivers/remoteproc/remoteproc_virtio.c
- drivers/rpmsg/Kconfig 0 additions, 1 deletiondrivers/rpmsg/Kconfig
- drivers/s390/kvm/kvm_virtio.c 4 additions, 1 deletiondrivers/s390/kvm/kvm_virtio.c
- drivers/virtio/Kconfig 6 additions, 11 deletionsdrivers/virtio/Kconfig
- drivers/virtio/Makefile 1 addition, 2 deletionsdrivers/virtio/Makefile
- drivers/virtio/virtio.c 1 addition, 1 deletiondrivers/virtio/virtio.c
- drivers/virtio/virtio_mmio.c 19 additions, 10 deletionsdrivers/virtio/virtio_mmio.c
- drivers/virtio/virtio_pci.c 58 additions, 10 deletionsdrivers/virtio/virtio_pci.c
- drivers/virtio/virtio_ring.c 13 additions, 1 deletiondrivers/virtio/virtio_ring.c
- include/linux/virtio.h 2 additions, 0 deletionsinclude/linux/virtio.h
- include/linux/virtio_config.h 23 additions, 0 deletionsinclude/linux/virtio_config.h
- include/linux/virtio_ring.h 2 additions, 1 deletioninclude/linux/virtio_ring.h
- kernel/trace/trace.c 1 addition, 7 deletionskernel/trace/trace.c
- tools/lguest/lguest.c 1 addition, 0 deletionstools/lguest/lguest.c
- tools/virtio/virtio-trace/Makefile 13 additions, 0 deletionstools/virtio/virtio-trace/Makefile
Loading
Please register or sign in to comment