From: Linus Torvalds Date: Thu, 17 May 2012 16:55:58 +0000 (-0700) Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=42e8b9c00176dd3a2f11d05f195131bac851558b;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'for_linus' of git://git./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 " * 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 --- 42e8b9c00176dd3a2f11d05f195131bac851558b