diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 09:55:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-17 09:55:58 -0700 |
| commit | 42e8b9c00176dd3a2f11d05f195131bac851558b (patch) | |
| tree | f2ac5e3ee4714eaf8ad9eb6b7646a87dcf1e2987 /net | |
| parent | 674ff51776b012783e5a0ce8ce2fa56f5fec050c (diff) | |
| parent | ec13ee80145ccb95b00e6e610044bbd94a170051 (diff) | |
| download | linux-3.10-42e8b9c00176dd3a2f11d05f195131bac851558b.tar.gz linux-3.10-42e8b9c00176dd3a2f11d05f195131bac851558b.tar.bz2 linux-3.10-42e8b9c00176dd3a2f11d05f195131bac851558b.zip | |
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Pull last minute virtio fixes from Michael S. Tsirkin:
"Here are a couple of last minute virtio fixes for 3.4. Hope it's not
too late yes - I might have tried too hard to make sure the fix is
well tested.
Fixes are by Amit and myself. One fixes module removal and one
suspend of a VM, the last one the handling of out of memory condition.
They are thus very low risk as most people never hit these paths, but
do fix very annoying problems for people that do use the feature.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>"
* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
virtio_net: invoke softirqs after __napi_schedule
virtio: balloon: let host know of updated balloon size before module removal
virtio: console: tell host of open ports after resume from s3/s4
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions