]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 21:14:04 +0000 (14:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 May 2013 21:14:04 +0000 (14:14 -0700)
commitddc46e853d73637d054337272938592d7f47f5cf
treede10d107025970c6e51d5b6faeba799ed4b9caae
parent1b5c147c7107eb797ceb197511cbe0a7a5aa1802
parentd6bda65962fcf172ddb955fdd6be00670db712d8
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

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
  ...
14 files changed:
MAINTAINERS
drivers/Makefile
drivers/char/hw_random/virtio-rng.c
drivers/char/virtio_console.c
drivers/lguest/page_tables.c
drivers/net/caif/Kconfig
drivers/net/caif/Makefile
drivers/net/virtio_net.c
drivers/rpmsg/virtio_rpmsg_bus.c
drivers/vhost/Kconfig
drivers/vhost/Makefile
drivers/vhost/test.c
include/linux/virtio.h
net/9p/trans_virtio.c