Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Feb 2018 22:29:27 +0000 (14:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Feb 2018 22:29:27 +0000 (14:29 -0800)
commit2439f9766d31eb17584c0e89351a1ec8d1c1d507
treef14ccdfcb36f8d794bb46036b019a83b69250915
parent1388c80438e69fc01d83fbe98da3cac24c3c8731
parentfa08a3b4eba59429cf7e241a7af089103e79160f
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio fixes from Michael Tsirkin:
 "This includes a bugfix for virtio 9p fs. It also fixes hybernation for
  s390 guests with virtio devices"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio/s390: implement PM operations for virtio_ccw
  9p/trans_virtio: discard zero-length reply