Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

Pull virtio updates from Rusty Russell:
 "Some virtio internal cleanups, a new virtio device "virtio input", and
  a change to allow the legacy virtio balloon.

  Most excitingly, some lguest work! No seriously, I got some cleanup
  patches"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  virtio: drop virtio_device_is_legacy_only
  virtio_pci: support non-legacy balloon devices
  virtio_mmio: support non-legacy balloon devices
  virtio_ccw: support non-legacy balloon devices
  virtio: balloon might not be a legacy device
  virtio_balloon: transitional interface
  virtio_ring: Update weak barriers to use dma_wmb/rmb
  virtio_pci_modern: switch to type-safe io accessors
  virtio_pci_modern: type-safe io accessors
  lguest: handle traps on the "interrupt suppressed" iret instruction.
  virtio: drop a useless config read
  virtio_config: reorder functions
  Add virtio-input driver.
  lguest: suppress interrupts for single insn, not range.
  lguest: simplify lguest_iret
  lguest: rename i386_head.S in the comments
  lguest: explicitly set miscdevice's private_data NULL
  lguest: fix pending interrupt test.

1 files changed, 6 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f6f595021d6b..df536b1207ee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10517,6 +10517,12 @@ S:	Maintained
 F:      drivers/vhost/
 F:      include/uapi/linux/vhost.h
 
+VIRTIO INPUT DRIVER
+M:      Gerd Hoffmann <kraxel@redhat.com>
+S:      Maintained
+F:      drivers/virtio/virtio_input.c
+F:      include/uapi/linux/virtio_input.h
+
 VIA RHINE NETWORK DRIVER
 M:      Roger Luethi <rl@hellgate.ch>
 S:      Maintained