Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2015 23:26:53 +0000 (16:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2015 23:26:53 +0000 (16:26 -0700)
commit056537c686e1eb8331ece43dff252903a7911dd0
tree13b687fff16dda6ca7e6e261cd717b837287eab4
parent40b985fbe9bca5b06d34c30af4b89c2fdbe72d49
parent210d150e1f5da506875e376422ba31ead2d49621
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull last-minute virtio fix from Michael Tsirkin:
 "This fixes a minor issue affecting multiqueue virtio net when user
  keeps changing the number of active queues and CPUs are added and
  removed by hotplug"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio_pci: Clear stale cpumask when setting irq affinity