diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 17:14:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 17:14:04 -0400 |
| commit | 736a2dd2571ac56b11ed95a7814d838d5311be04 (patch) | |
| tree | de10d107025970c6e51d5b6faeba799ed4b9caae /drivers/Makefile | |
| parent | 0b2e3b6bb4a415379f16e38fc92db42379be47a1 (diff) | |
| parent | 01d779a14ef800b74684d9692add4944df052461 (diff) | |
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
...
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 33360de63650..8e57688ebd95 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -124,7 +124,7 @@ obj-$(CONFIG_PPC_PS3) += ps3/ | |||
| 124 | obj-$(CONFIG_OF) += of/ | 124 | obj-$(CONFIG_OF) += of/ |
| 125 | obj-$(CONFIG_SSB) += ssb/ | 125 | obj-$(CONFIG_SSB) += ssb/ |
| 126 | obj-$(CONFIG_BCMA) += bcma/ | 126 | obj-$(CONFIG_BCMA) += bcma/ |
| 127 | obj-$(CONFIG_VHOST_NET) += vhost/ | 127 | obj-$(CONFIG_VHOST_RING) += vhost/ |
| 128 | obj-$(CONFIG_VLYNQ) += vlynq/ | 128 | obj-$(CONFIG_VLYNQ) += vlynq/ |
| 129 | obj-$(CONFIG_STAGING) += staging/ | 129 | obj-$(CONFIG_STAGING) += staging/ |
| 130 | obj-y += platform/ | 130 | obj-y += platform/ |