Linus Torvalds
b7ffff4bb3
Merge branch 's3-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console ...
Pull virtio S3 support patches from Amit Shah:
"Turns out S3 is not different from S4 for virtio devices: the device
is assumed to be reset, so the host and guest state are to be assumed
to be out of sync upon resume. We handle the S4 case with exactly the
same scenario, so just point the suspend/resume routines to the
freeze/restore ones.
Once that is done, we also use the PM API's macro to initialise the
sleep functions.
A couple of cleanups are included: there's no need for special thaw
processing in the balloon driver, so that's addressed in patches 1 and
2.
Testing: both S3 and S4 support have been tested using these patches
using a similar method used earlier during S4 patch development: a
guest is started with virtio-blk as the only disk, a virtio network
card, a virtio-serial port and a virtio balloon device. Ping from
guest to host, dd /dev/zero to a file on the disk, and IO from the
host on the virtio-serial port, all at once, while exercising S4 and
S3 (separately) were tested. They all continue to work fine after
resume. virtio balloon values too were tested by inflating and
deflating the balloon."
Pulling from Amit, since Rusty is off getting married (and presumably
shaving people).
* 's3-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console:
virtio-pci: switch to PM ops macro to initialise PM functions
virtio-pci: S3 support
virtio-pci: drop restore_common()
virtio: drop thaw PM operation
virtio: balloon: Allow stats update after restore from S4
2012-03-31 15:11:39 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
2012-03-28 15:02:41 -07:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
ARM: global cleanups
2012-03-27 16:03:32 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2012-03-28 14:24:40 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
drm/i915: suspend fbdev device around suspend/hibernate
2012-03-29 07:44:27 +01:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-03-29 23:17:44 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
dm: add verity target
2012-03-28 18:43:38 +01:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-03-31 13:42:57 -07:00
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
ASPM: Fix pcie devices with non-pcie children
2012-03-31 12:49:56 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
ARM: driver specific updates
2012-03-27 16:41:24 -07:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
SCSI updates on 20120331
2012-03-31 13:31:23 -07:00
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-03-29 15:34:57 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
remoteproc/rpmsg: new subsystem
2012-03-27 16:30:09 -07:00
b7ffff4bb3