OSDN Git Service

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2016 23:20:40 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2016 23:20:40 +0000 (16:20 -0700)
commitd3436a1d03f9a416d8bedd968f16296e0140adcb
tree6809a3acc09cafafa4df0646154eb990eeccaab6
parent741f37b8ccf10b3f9976f7e55b703af8087f182a
parentc00bbcf8628969e103d4a7b351a53746f1025576
Merge tag 'for_linus' of git://git./linux/kernel/git/mst/vhost

Pull virtio/qemu fixes from Michael S Tsirkin:
 "A couple of fixes for virtio and for the new QEMU fw cfg driver"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  virtio: add VIRTIO_CONFIG_S_NEEDS_RESET device status bit
  MAINTAINERS: add entry for QEMU
  firmware: qemu_fw_cfg.c: hold ACPI global lock during device access
  virtio: virtio 1.0 cs04 spec compliance for reset
  qemu_fw_cfg: don't leak kobj on init error
MAINTAINERS