Commit bcf8a3dfcb274cf6654a19e12e244f3af8c0d355
Exists in
master
and in
38 other branches
Merge tag 'to-linus' of git://github.com/rustyrussell/linux
* tag 'to-linus' of git://github.com/rustyrussell/linux: (24 commits) lguest: Make sure interrupt is allocated ok by lguest_setup_irq lguest: move the lguest tool to the tools directory lguest: switch segment-voodoo-numbers to readable symbols virtio: balloon: Add freeze, restore handlers to support S4 virtio: balloon: Move vq initialization into separate function virtio: net: Add freeze, restore handlers to support S4 virtio: net: Move vq and vq buf removal into separate function virtio: net: Move vq initialization into separate function virtio: blk: Add freeze, restore handlers to support S4 virtio: blk: Move vq initialization to separate function virtio: console: Disable callbacks for virtqueues at start of S4 freeze virtio: console: Add freeze and restore handlers to support S4 virtio: console: Move vq and vq buf removal into separate functions virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff virtio: pci: switch to new PM API virtio_blk: fix config handler race virtio: add debugging if driver doesn't kick. virtio: expose added descriptors immediately. virtio: avoid modulus operation. virtio: support unlocked queue kick ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 28 changed files Side-by-side Diff
- Documentation/virtual/lguest/.gitignore
- Documentation/virtual/lguest/Makefile
- Documentation/virtual/lguest/extract
- Documentation/virtual/lguest/lguest.c
- Documentation/virtual/lguest/lguest.txt
- arch/x86/lguest/boot.c
- drivers/block/virtio_blk.c
- drivers/char/hw_random/virtio-rng.c
- drivers/char/virtio_console.c
- drivers/lguest/Makefile
- drivers/lguest/lguest_device.c
- drivers/lguest/segments.c
- drivers/net/virtio_net.c
- drivers/s390/kvm/kvm_virtio.c
- drivers/virtio/virtio_balloon.c
- drivers/virtio/virtio_mmio.c
- drivers/virtio/virtio_pci.c
- drivers/virtio/virtio_ring.c
- include/linux/virtio.h
- include/linux/virtio_ring.h
- net/9p/trans_virtio.c
- tools/lguest/.gitignore
- tools/lguest/Makefile
- tools/lguest/extract
- tools/lguest/lguest.c
- tools/lguest/lguest.txt
- tools/virtio/linux/virtio.h
- tools/virtio/virtio_test.c