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

Pull virtio & lguest updates from Rusty Russell:
 "Lots of virtio work which wasn't quite ready for last merge window.

  Plus I dived into lguest again, reworking the pagetable code so we can
  move the switcher page: our fixmaps sometimes take more than 2MB now..."

Ugh.  Annoying conflicts with the tcm_vhost -> vhost_scsi rename.
Hopefully correctly resolved.

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux: (57 commits)
  caif_virtio: Remove bouncing email addresses
  lguest: improve code readability in lg_cpu_start.
  virtio-net: fill only rx queues which are being used
  lguest: map Switcher below fixmap.
  lguest: cache last cpu we ran on.
  lguest: map Switcher text whenever we allocate a new pagetable.
  lguest: don't share Switcher PTE pages between guests.
  lguest: expost switcher_pages array (as lg_switcher_pages).
  lguest: extract shadow PTE walking / allocating.
  lguest: make check_gpte et. al return bool.
  lguest: assume Switcher text is a single page.
  lguest: rename switcher_page to switcher_pages.
  lguest: remove RESERVE_MEM constant.
  lguest: check vaddr not pgd for Switcher protection.
  lguest: prepare to make SWITCHER_ADDR a variable.
  virtio: console: replace EMFILE with EBUSY for already-open port
  virtio-scsi: reset virtqueue affinity when doing cpu hotplug
  virtio-scsi: introduce multiqueue support
  virtio-scsi: push vq lock/unlock into virtscsi_vq_done
  virtio-scsi: pass struct virtio_scsi to virtqueue completion function
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/char/hw_random/virtio-rng.c
Simple merge

diff --cc drivers/char/virtio_console.c
index ce5f3fc25d6dbf1f7c45ff4cad6d2349da202d1a,5ee776595ced59495ae5ac43f81ccf658a85fac7..1b456fe9b87a12f98e8a6d691487c252271cb3e6
--- 1/drivers/char/virtio_console.c
--- 2/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@@ -570,9 -569,7 +570,9 @@@ static ssize_t __send_control_msg(struc
        vq = portdev->c_ovq;
  
        sg_init_one(sg, &cpkt, sizeof(cpkt));
-       if (virtqueue_add_buf(vq, sg, 1, 0, &cpkt, GFP_ATOMIC) == 0) {
 +
 +      spin_lock(&portdev->c_ovq_lock);
+       if (virtqueue_add_outbuf(vq, sg, 1, &cpkt, GFP_ATOMIC) == 0) {
                virtqueue_kick(vq);
                while (!virtqueue_get_buf(vq, &len))
                        cpu_relax();

diff --cc drivers/lguest/page_tables.c
Simple merge

diff --cc drivers/net/caif/Kconfig
Simple merge

diff --cc drivers/net/caif/Makefile
index 15a9d2fc753dcc8ef1ea6153b3be59c3ed6d5eb7,d9ee26a96c6e19b8699358a79c2a3a6bed325382..9bbd45391f6cd00ea52772260c666bdcb579109c
--- 1/drivers/net/caif/Makefile
--- 2/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@@ -7,5 -7,12 +7,8 @@@ obj-$(CONFIG_CAIF_TTY) += caif_serial.
  cfspi_slave-objs := caif_spi.o caif_spi_slave.o
  obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o
  
 -# Shared memory
 -caif_shm-objs := caif_shmcore.o caif_shm_u5500.o
 -obj-$(CONFIG_CAIF_SHM) += caif_shm.o
 -
  # HSI interface
  obj-$(CONFIG_CAIF_HSI) += caif_hsi.o
+ 
+ # Virtio interface
+ obj-$(CONFIG_CAIF_VIRTIO) += caif_virtio.o

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc drivers/rpmsg/virtio_rpmsg_bus.c
Simple merge

diff --cc drivers/vhost/Kconfig
index 26a64e5b8a580d0a7700a63c17a8d2a0465bb4cd,85b773a93a5d1ec4e568ef0db77bd064838f9938..8b9226da3f546d3d1900fbdb4068cde9497fa503
--- 1/drivers/vhost/Kconfig
--- 2/drivers/vhost/Kconfig
+++ b/drivers/vhost/Kconfig
@@@ -9,10 -10,13 +10,17 @@@ config VHOST_NE
          To compile this driver as a module, choose M here: the module will
          be called vhost_net.
  
 -if STAGING
 -source "drivers/vhost/Kconfig.tcm"
 -endif
 +config VHOST_SCSI
 +      tristate "VHOST_SCSI TCM fabric driver"
 +      depends on TARGET_CORE && EVENTFD && m
++      select VHOST_RING
 +      default n
 +      ---help---
 +      Say M here to enable the vhost_scsi TCM fabric module
 +      for use with virtio-scsi guests
+ 
+ config VHOST_RING
+       tristate
+       ---help---
+         This option is selected by any driver which needs to access
+         the host side of a virtio ring.
 -

diff --cc drivers/vhost/Makefile
index ef21d5fdfa7d142175c9de3f24dabc39f4bd6b32,1d37f5e12be619428c3279af45461c0a891aa3dc..654e9afb11f578aa497802e77280f2f5bfa8b70e
--- 1/drivers/vhost/Makefile
--- 2/drivers/vhost/Makefile
+++ b/drivers/vhost/Makefile
@@@ -1,5 -1,6 +1,7 @@@
  obj-$(CONFIG_VHOST_NET) += vhost_net.o
  vhost_net-y := vhost.o net.o
  
 -obj-$(CONFIG_TCM_VHOST) += tcm_vhost.o
 +obj-$(CONFIG_VHOST_SCSI) += vhost_scsi.o
 +vhost_scsi-y := scsi.o
+ 
+ obj-$(CONFIG_VHOST_RING) += vringh.o

diff --cc drivers/vhost/test.c
Simple merge

diff --cc include/linux/virtio.h
Simple merge

diff --cc net/9p/trans_virtio.c
Simple merge