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

Pull virtio updates from Rusty Russell:
 "No real surprises"

* tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  MAINTAINERS: add tools/virtio/ under virtio
  tools/virtio: move module license stub to module.h
  virtio: include asm/barrier explicitly
  virtio: VIRTIO_F_ANY_LAYOUT feature
  lguest: fix example launcher compilation for broken glibc headers.
  virtio-net: fix the race between channels setting and refill
  tools/lguest: real barriers.
  tools/lguest: fix missing rmb().
  virtio_balloon: leak_balloon(): only tell host if we got pages deflated
  virtio-pci: fix leaks of msix_affinity_masks
  Fix comment typo "CONFIG_PAE"

diff --combined MAINTAINERS
index af4c3be44ac395661af213ddb482f81cda6d98b0,0680f447d740ac3810cd7c0f01ee2c4aacb3cb4d..e51d01836b540d6a6efe934935ee84aa34454191
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -180,11 -180,6 +180,11 @@@ T:       git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
  F:    fs/9p/
 +F:    net/9p/
 +F:    include/net/9p/
 +F:    include/uapi/linux/virtio_9p.h
 +F:    include/trace/events/9p.h
 +
  
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
@@@ -247,11 -242,6 +247,11 @@@ F:       drivers/acpi
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
  F:    include/acpi/
 +F:    Documentation/acpi
 +F:    Documentation/ABI/testing/sysfs-bus-acpi
 +F:    drivers/pci/*acpi*
 +F:    drivers/pci/*/*acpi*
 +F:    drivers/pci/*/*/*acpi*
  
  ACPI FAN DRIVER
  M:    Zhang Rui <[email protected]>
@@@ -752,7 -742,7 +752,7 @@@ S: Maintaine
  F:    arch/arm/mach-highbank/
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
 -M:    Anton Vorontsov <a[email protected]>
 +M:    Anton Vorontsov <a[email protected]>
  S:    Maintained
  F:    arch/arm/mach-cns3xxx/
  T:    git git://git.infradead.org/users/cbou/linux-cns3xxx.git
@@@ -807,7 -797,6 +807,7 @@@ F: arch/arm/mach-gemini
  ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
  M:    Barry Song <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
  S:    Maintained
  F:    arch/arm/mach-prima2/
  F:    drivers/dma/sirf-dma.c
@@@ -1146,7 -1135,6 +1146,7 @@@ L:      [email protected] (m
  S:    Maintained
  F:    arch/arm/mach-s5p*/
  F:    arch/arm/mach-exynos*/
 +N:    exynos
  
  ARM/SAMSUNG MOBILE MACHINE SUPPORT
  M:    Kyungmin Park <[email protected]>
@@@ -1213,15 -1201,6 +1213,15 @@@ M:    Dinh Nguyen <[email protected]
  S:    Maintained
  F:    drivers/clk/socfpga/
  
 +ARM/STI ARCHITECTURE
 +M:    Srinivas Kandagatla <[email protected]>
 +M:    Stuart Menefy <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +W:    http://www.stlinux.com
 +S:    Maintained
 +F:    arch/arm/mach-sti/
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1306,7 -1285,6 +1306,7 @@@ S:      Maintaine
  F:    arch/arm/mach-vt8500/
  F:    drivers/clocksource/vt8500_timer.c
  F:    drivers/gpio/gpio-vt8500.c
 +F:    drivers/i2c/busses/i2c-wmt.c
  F:    drivers/mmc/host/wmt-sdmmc.c
  F:    drivers/pwm/pwm-vt8500.c
  F:    drivers/rtc/rtc-vt8500.c
@@@ -1331,13 -1309,6 +1331,13 @@@ W:    http://wiki.xilinx.co
  T:    git git://git.xilinx.com/linux-xlnx.git
  S:    Supported
  F:    arch/arm/mach-zynq/
 +F:    drivers/cpuidle/cpuidle-zynq.c
 +
 +ARM SMMU DRIVER
 +M:    Will Deacon <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/iommu/arm-smmu.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <[email protected]>
@@@ -1629,7 -1600,6 +1629,7 @@@ F:      drivers/net/wireless/b43legacy
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Richard Purdie <[email protected]>
 +M:    Jingoo Han <[email protected]>
  S:    Maintained
  F:    drivers/video/backlight/
  F:    include/linux/backlight.h
@@@ -1888,13 -1858,6 +1888,13 @@@ S:    Odd fixe
  F:    Documentation/video4linux/bttv/
  F:    drivers/media/pci/bt8xx/bttv*
  
 +BUSLOGIC SCSI DRIVER
 +M:    Khalid Aziz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/scsi/BusLogic.*
 +F:    drivers/scsi/FlashPoint.*
 +
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2157,10 -2120,9 +2157,10 @@@ M:    Mike Turquette <[email protected]
  L:    [email protected] (same as CLK API & CLKDEV)
  T:    git git://git.linaro.org/people/mturquette/linux.git
  S:    Maintained
 -F:    drivers/clk/clk.c
 -F:    drivers/clk/clk-*
 +F:    drivers/clk/
 +X:    drivers/clk/clkdev.c
  F:    include/linux/clk-pr*
 +F:    include/linux/clk/
  
  COMMON INTERNET FILE SYSTEM (CIFS)
  M:    Steve French <[email protected]>
@@@ -2253,8 -2215,7 +2253,8 @@@ M:      Viresh Kumar <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
  F:    drivers/cpufreq/
  F:    include/linux/cpufreq.h
  
@@@ -2338,11 -2299,6 +2338,11 @@@ M:    Jaya Kumar <[email protected]
  S:    Maintained
  F:    sound/pci/cs5535audio/
  
 +CW1200 WLAN driver
 +M:     Solomon Peachy <[email protected]>
 +S:     Maintained
 +F:     drivers/net/wireless/cw1200/
 +
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2560,7 -2516,7 +2560,7 @@@ F:      drivers/usb/dwc3
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
 -L:    linux-kernel@vger.kernel.org
 +L:    linux-pm@vger.kernel.org
  S:    Maintained
  F:    drivers/devfreq/
  
@@@ -2741,14 -2697,12 +2741,14 @@@ F:   include/drm/exynos
  F:    include/uapi/drm/exynos*
  
  DRM DRIVERS FOR NVIDIA TEGRA
 -M:    Thierry Reding <[email protected]>
 +M:    Thierry Reding <[email protected]>
 +M:    Terje Bergström <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -T:    git git://gitorious.org/thierryreding/linux.git
 +T:    git git://anongit.freedesktop.org/tegra/linux.git
  S:    Maintained
 -F:    drivers/gpu/drm/tegra/
 +F:    drivers/gpu/host1x/
 +F:    include/uapi/drm/tegra_drm.h
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  
  DSBR100 USB FM RADIO DRIVER
@@@ -2936,8 -2890,8 +2936,8 @@@ F:      drivers/media/dvb-frontends/ec100
  
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <[email protected]>
 -M:    Dustin Kirkland <[email protected]>
  L:    [email protected]
 +W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
@@@ -3149,13 -3103,6 +3149,13 @@@ M:    Maxim Levitsky <maximlevitsky@gmail.
  S:    Maintained
  F:    drivers/media/rc/ene_ir.*
  
 +ENHANCED ERROR HANDLING (EEH)
 +M:    Gavin Shan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/powerpc/eeh-pci-error-recovery.txt
 +F:    arch/powerpc/kernel/eeh*.c
 +
  EPSON S1D13XXX FRAMEBUFFER DRIVER
  M:    Kristoffer Ericson <[email protected]>
  S:    Maintained
@@@ -3273,7 -3220,7 +3273,7 @@@ F:      lib/fault-inject.
  
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
  M:    Robert Love <[email protected]>
 -L:    [email protected]
 +L:    fcoe-[email protected]
  W:    www.Open-FCoE.org
  S:    Supported
  F:    drivers/scsi/libfc/
@@@ -3362,15 -3309,6 +3362,15 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Odd fixes
  F:    drivers/block/floppy.c
  
 +FMC SUBSYSTEM
 +M:    Alessandro Rubini <[email protected]>
 +W:    http://www.ohwr.org/projects/fmc-bus
 +S:    Supported
 +F:    drivers/fmc/
 +F:    include/linux/fmc*.h
 +F:    include/linux/ipmi-fru.h
 +K:    fmc_d.*register
 +
  FPU EMULATOR
  M:    Bill Metzenthen <[email protected]>
  W:    http://floatingpoint.sourceforge.net/emulator/index.html
@@@ -3384,12 -3322,11 +3384,12 @@@ F:   drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Florian Tobias Schandinat <[email protected]>
 +M:    Jean-Christophe Plagniol-Villard <[email protected]>
 +M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
  W:    http://linux-fbdev.sourceforge.net/
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -T:    git git://github.com/schandinat/linux-2.6.git fbdev-next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git
  S:    Maintained
  F:    Documentation/fb/
  F:    Documentation/devicetree/bindings/fb/
@@@ -3629,7 -3566,6 +3629,7 @@@ GPIO SUBSYSTE
  M:    Grant Likely <[email protected]>
  M:    Linus Walleij <[email protected]>
  S:    Maintained
 +L:    [email protected]
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  F:    Documentation/gpio.txt
  F:    drivers/gpio/
@@@ -3929,16 -3865,9 +3929,16 @@@ M:    K. Y. Srinivasan <[email protected]
  M:    Haiyang Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/hv/
 +F:    arch/x86/include/asm/mshyperv.h
 +F:    arch/x86/include/uapi/asm/hyperv.h
 +F:    arch/x86/kernel/cpu/mshyperv.c
  F:    drivers/hid/hid-hyperv.c
 +F:    drivers/hv/
  F:    drivers/net/hyperv/
 +F:    drivers/scsi/storvsc_drv.c
 +F:    drivers/video/hyperv_fb.c
 +F:    include/linux/hyperv.h
 +F:    tools/hv/
  
  I2C OVER PARALLEL PORT
  M:    Jean Delvare <[email protected]>
@@@ -4042,8 -3971,7 +4042,8 @@@ S:      Maintaine
  F:    arch/ia64/
  
  IBM Power in-Nest Crypto Acceleration
 -M:    Kent Yoder <[email protected]>
 +M:    Marcelo Henrique Cerri <[email protected]>
 +M:    Fionnuala Gunter <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/crypto/nx/
@@@ -4172,7 -4100,6 +4172,7 @@@ F:      drivers/ipack
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <[email protected]>
 +M:    Dmitry Kasatkin <[email protected]>
  S:    Supported
  F:    security/integrity/ima/
  
@@@ -4513,16 -4440,6 +4513,16 @@@ S:    Maintaine
  F:    drivers/scsi/*iscsi*
  F:    include/scsi/*iscsi*
  
 +ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR
 +M:    Or Gerlitz <[email protected]>
 +M:    Roi Dayan <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.openfabrics.org
 +W:    www.open-iscsi.org
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +F:    drivers/infiniband/ulp/iser
 +
  ISDN SUBSYSTEM
  M:    Karsten Keil <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -4642,7 -4559,7 +4642,7 @@@ F:      fs/jbd2
  F:    include/linux/jbd2.h
  
  JSM Neo PCI based serial card
 -M:    Lucas Tavares <lucaskt@linux.vnet.ibm.com>
 +M:    Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -4724,13 -4641,12 +4724,13 @@@ F:   include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Marcelo Tosatti <[email protected]>
  M:    Gleb Natapov <[email protected]>
 +M:    Paolo Bonzini <[email protected]>
  L:    [email protected]
 -W:    http://kvm.qumranet.com
 +W:    http://linux-kvm.org
  S:    Supported
 -F:    Documentation/*/kvm.txt
 +F:    Documentation/*/kvm*.txt
 +F:    Documentation/virtual/kvm/
  F:    arch/*/kvm/
  F:    arch/*/include/asm/kvm*
  F:    include/linux/kvm*
@@@ -4776,23 -4692,14 +4776,23 @@@ F:   arch/s390/kvm
  F:    drivers/s390/kvm/
  
  KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 -M:    Christoffer Dall <c[email protected]>
 +M:    Christoffer Dall <c[email protected]>
  L:    [email protected]
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
 -S:    Maintained
 +S:    Supported
  F:    arch/arm/include/uapi/asm/kvm*
  F:    arch/arm/include/asm/kvm*
  F:    arch/arm/kvm/
  
 +KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm64/include/uapi/asm/kvm*
 +F:    arch/arm64/include/asm/kvm*
 +F:    arch/arm64/kvm/
 +
  KEXEC
  M:    Eric Biederman <[email protected]>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -5069,13 -4976,6 +5069,13 @@@ S:    Maintaine
  F:    Documentation/hwmon/lm90
  F:    drivers/hwmon/lm90.c
  
 +LM95234 HARDWARE MONITOR DRIVER
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/lm95234
 +F:    drivers/hwmon/lm95234.c
 +
  LME2510 MEDIA DRIVER
  M:    Malcolm Priestley <[email protected]>
  L:    [email protected]
@@@ -5506,12 -5406,9 +5506,12 @@@ F:    include/media/mt9v032.
  
  MULTIFUNCTION DEVICES (MFD)
  M:    Samuel Ortiz <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
 +M:    Lee Jones <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git
  S:    Supported
  F:    drivers/mfd/
 +F:    include/linux/mfd/
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  M:    Chris Ball <[email protected]>
@@@ -5612,18 -5509,18 +5612,18 @@@ F:   Documentation/networking/s2io.tx
  F:    Documentation/networking/vxge.txt
  F:    drivers/net/ethernet/neterion/
  
 -NETFILTER/IPTABLES/IPCHAINS
 -P:    Harald Welte
 -P:    Jozsef Kadlecsik
 +NETFILTER/IPTABLES
  M:    Pablo Neira Ayuso <[email protected]>
  M:    Patrick McHardy <[email protected]>
 +M:    Jozsef Kadlecsik <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
 -T:    git git://1984.lsi.us.es/nf
 -T:    git git://1984.lsi.us.es/nf-next
 +Q:    http://patchwork.ozlabs.org/project/netfilter-devel/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -5843,7 -5740,7 +5843,7 @@@ M:      Matthew Wilcox <[email protected]
  L:    [email protected]
  T:    git git://git.infradead.org/users/willy/linux-nvme.git
  S:    Supported
 -F:    drivers/block/nvme.c
 +F:    drivers/block/nvme*
  F:    include/linux/nvme.h
  
  OMAP SUPPORT
@@@ -6011,10 -5908,8 +6011,10 @@@ M:    Willem Riede <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/scsi/osst*
 -F:    drivers/scsi/st*
 +F:    Documentation/scsi/osst.txt
 +F:    drivers/scsi/osst.*
 +F:    drivers/scsi/osst_*.h
 +F:    drivers/scsi/st.h
  
  OPENCORES I2C BUS DRIVER
  M:    Peter Korsgaard <[email protected]>
@@@ -6174,18 -6069,9 +6174,18 @@@ L:    [email protected]
  W:    http://www.parisc-linux.org/
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
  S:    Maintained
  F:    arch/parisc/
 +F:    Documentation/parisc/
  F:    drivers/parisc/
 +F:    drivers/char/agp/parisc-agp.c
 +F:    drivers/input/serio/gscps2.c
 +F:    drivers/parport/parport_gsc.*
 +F:    drivers/tty/serial/8250/8250_gsc.c
 +F:    drivers/video/sti*
 +F:    drivers/video/console/sti*
 +F:    drivers/video/logo/logo_parisc*
  
  PC87360 HARDWARE MONITORING DRIVER
  M:    Jim Cromie <[email protected]>
@@@ -6228,6 -6114,7 +6228,6 @@@ M:      Linas Vepstas <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
 -F:    Documentation/powerpc/eeh-pci-error-recovery.txt
  
  PCI SUBSYSTEM
  M:    Bjorn Helgaas <[email protected]>
@@@ -6343,16 -6230,6 +6343,16 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/pinctrl/pinctrl-at91.c
  
 +PIN CONTROLLER - SAMSUNG
 +M:    Tomasz Figa <[email protected]>
 +M:    Thomas Abraham <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pinctrl/pinctrl-exynos.*
 +F:    drivers/pinctrl/pinctrl-s3c*
 +F:    drivers/pinctrl/pinctrl-samsung.*
 +
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -6412,7 -6289,7 +6412,7 @@@ F:      include/linux/timer
  F:    kernel/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Anton Vorontsov <[email protected]>
 +M:    Anton Vorontsov <[email protected]>
  M:    David Woodhouse <[email protected]>
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
@@@ -6522,7 -6399,7 +6522,7 @@@ S:      Maintaine
  F:    drivers/block/ps3vram.c
  
  PSTORE FILESYSTEM
 -M:    Anton Vorontsov <[email protected]>
 +M:    Anton Vorontsov <[email protected]>
  M:    Colin Cross <[email protected]>
  M:    Kees Cook <[email protected]>
  M:    Tony Luck <[email protected]>
@@@ -6574,8 -6451,8 +6574,8 @@@ S:      Maintaine
  F:    drivers/media/usb/pwc/*
  
  PWM SUBSYSTEM
 -M:    Thierry Reding <thierry.reding@avionic-design.de>
 -L:    linux-kernel@vger.kernel.org
 +M:    Thierry Reding <thierry.reding@gmail.com>
 +L:    linux-pwm@vger.kernel.org
  S:    Maintained
  W:    http://gitorious.org/linux-pwm
  T:    git git://gitorious.org/linux-pwm/linux-pwm.git
@@@ -7078,7 -6955,8 +7078,7 @@@ SYNOPSYS DESIGNWARE DMAC DRIVE
  M:    Viresh Kumar <[email protected]>
  S:    Maintained
  F:    include/linux/dw_dmac.h
 -F:    drivers/dma/dw_dmac_regs.h
 -F:    drivers/dma/dw_dmac.c
 +F:    drivers/dma/dw/
  
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
  M:    Seungwon Jeon <[email protected]>
@@@ -7170,8 -7048,7 +7170,8 @@@ M:      Kai Mäkisara <Kai.Makisara@kolumbus
  L:    [email protected]
  S:    Maintained
  F:    Documentation/scsi/st.txt
 -F:    drivers/scsi/st*
 +F:    drivers/scsi/st.*
 +F:    drivers/scsi/st_*.h
  
  SCTP PROTOCOL
  M:    Vlad Yasevich <[email protected]>
@@@ -7220,7 -7097,7 +7220,7 @@@ F:      drivers/mmc/host/sdhci.
  F:    drivers/mmc/host/sdhci-pltfm.[ch]
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 -M:    Anton Vorontsov <a[email protected]>
 +M:    Anton Vorontsov <a[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -7712,7 -7589,7 +7712,7 @@@ F:      drivers/clk/spear
  SPI SUBSYSTEM
  M:    Mark Brown <[email protected]>
  M:    Grant Likely <[email protected]>
 -L:    [email protected]
 +L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  S:    Maintained
@@@ -7755,7 -7632,6 +7755,7 @@@ STABLE BRANC
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  S:    Supported
 +F:    Documentation/stable_kernel_rules.txt
  
  STAGING SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -7872,7 -7748,7 +7872,7 @@@ F:      drivers/staging/media/solo6x10
  STAGING - SPEAKUP CONSOLE SPEECH DRIVER
  M:    William Hubbs <[email protected]>
  M:    Chris Brannon <[email protected]>
 -M:    Kirk Reiser <kirk@braille.uwo.ca>
 +M:    Kirk Reiser <kirk@reisers.ca>
  M:    Samuel Thibault <[email protected]>
  L:    [email protected]
  W:    http://www.linux-speakup.org/
@@@ -8306,13 -8182,6 +8306,13 @@@ F:    drivers/mmc/host/sh_mobile_sdhi.
  F:    include/linux/mmc/tmio.h
  F:    include/linux/mmc/sh_mobile_sdhi.h
  
 +TMP401 HARDWARE MONITOR DRIVER
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/tmp401
 +F:    drivers/hwmon/tmp401.c
 +
  TMPFS (SHMEM FILESYSTEM)
  M:    Hugh Dickins <[email protected]>
  L:    [email protected]
@@@ -8329,8 -8198,7 +8329,8 @@@ S:      Odd fixe
  F:    drivers/media/usb/tm6000/
  
  TPM DEVICE DRIVER
 -M:    Kent Yoder <[email protected]>
 +M:    Leonidas Da Silva Barbosa <[email protected]>
 +M:    Ashley Lai <[email protected]>
  M:    Rajiv Andrade <[email protected]>
  W:    http://tpmdd.sourceforge.net
  M:    Marcel Selhorst <[email protected]>
@@@ -8890,6 -8758,7 +8890,7 @@@ M:      "Michael S. Tsirkin" <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/virtio/
+ F:    tools/virtio/
  F:    drivers/net/virtio_net.c
  F:    drivers/block/virtio_blk.c
  F:    include/linux/virtio_*.h
@@@ -8985,7 -8854,7 +8986,7 @@@ M:      Liam Girdwood <[email protected]
  M:    Mark Brown <[email protected]>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
  S:    Supported
  F:    drivers/regulator/
  F:    include/linux/regulator/
@@@ -9094,7 -8963,7 +9095,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/wl3501*
  
  WM97XX TOUCHSCREEN DRIVERS
 -M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +M:    Mark Brown <broonie@kernel.org>
  M:    Liam Girdwood <[email protected]>
  L:    [email protected]
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-touch
@@@ -9104,6 -8973,7 +9105,6 @@@ F:      drivers/input/touchscreen/*wm97
  F:    include/linux/wm97xx.h
  
  WOLFSON MICROELECTRONICS DRIVERS
 -M:    Mark Brown <[email protected]>
  L:    [email protected]
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
  T:    git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
@@@ -9204,13 -9074,6 +9205,13 @@@ S:    Supporte
  F:    arch/arm/xen/
  F:    arch/arm/include/asm/xen/
  
 +XEN HYPERVISOR ARM64
 +M:    Stefano Stabellini <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/arm64/xen/
 +F:    arch/arm64/include/asm/xen/
 +
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -9284,13 -9147,6 +9285,13 @@@ F:    Documentation/networking/z8530drv.tx
  F:    drivers/net/hamradio/*scc.c
  F:    drivers/net/hamradio/z8530.h
  
 +ZBUD COMPRESSED PAGE ALLOCATOR
 +M:    Seth Jennings <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    mm/zbud.c
 +F:    include/linux/zbud.h
 +
  ZD1211RW WIRELESS DRIVER
  M:    Daniel Drake <[email protected]>
  M:    Ulrich Kunitz <[email protected]>
@@@ -9313,12 -9169,6 +9314,12 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/zs.*
  
 +ZSWAP COMPRESSED SWAP CACHING
 +M:    Seth Jennings <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    mm/zswap.c
 +
  THE REST
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]

diff --combined drivers/net/virtio_net.c
index 42d670a468f89462a4e31ebde531c6a0e9c3b644,6ddd77ece5d505900c87afb8dd9f93b57602cf3e..3d2a90a626498d20c96ba7729beacec16b9b5040
--- 1/drivers/net/virtio_net.c
--- 2/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -602,7 -602,7 +602,7 @@@ static int virtnet_poll(struct napi_str
                container_of(napi, struct receive_queue, napi);
        struct virtnet_info *vi = rq->vq->vdev->priv;
        void *buf;
 -      unsigned int len, received = 0;
 +      unsigned int r, len, received = 0;
  
  again:
        while (received < budget &&
@@@ -619,9 -619,8 +619,9 @@@
  
        /* Out of packets? */
        if (received < budget) {
 +              r = virtqueue_enable_cb_prepare(rq->vq);
                napi_complete(napi);
 -              if (unlikely(!virtqueue_enable_cb(rq->vq)) &&
 +              if (unlikely(virtqueue_poll(rq->vq, r)) &&
                    napi_schedule_prep(napi)) {
                        virtqueue_disable_cb(rq->vq);
                        __napi_schedule(napi);
@@@ -637,11 -636,10 +637,11 @@@ static int virtnet_open(struct net_devi
        struct virtnet_info *vi = netdev_priv(dev);
        int i;
  
 -      for (i = 0; i < vi->curr_queue_pairs; i++) {
 -              /* Make sure we have some buffers: if oom use wq. */
 -              if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
 -                      schedule_delayed_work(&vi->refill, 0);
 +      for (i = 0; i < vi->max_queue_pairs; i++) {
 +              if (i < vi->curr_queue_pairs)
 +                      /* Make sure we have some buffers: if oom use wq. */
 +                      if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
 +                              schedule_delayed_work(&vi->refill, 0);
                virtnet_napi_enable(&vi->rq[i]);
        }
  
@@@ -902,7 -900,6 +902,6 @@@ static int virtnet_set_queues(struct vi
        struct scatterlist sg;
        struct virtio_net_ctrl_mq s;
        struct net_device *dev = vi->dev;
-       int i;
  
        if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ))
                return 0;
@@@ -916,10 -913,8 +915,8 @@@
                         queue_pairs);
                return -EINVAL;
        } else {
-               for (i = vi->curr_queue_pairs; i < queue_pairs; i++)
-                       if (!try_fill_recv(&vi->rq[i], GFP_KERNEL))
-                               schedule_delayed_work(&vi->refill, 0);
                vi->curr_queue_pairs = queue_pairs;
+               schedule_delayed_work(&vi->refill, 0);
        }
  
        return 0;

diff --combined drivers/virtio/virtio_balloon.c
index 0098810df69da6bb795b85a573ca28d7bd5a7609,71af7b5abe01780f3fcf99d5d621bfdbf8819b55..1f572c00a1bec2f13e68861e6dda971e6fef5d40
--- 1/drivers/virtio/virtio_balloon.c
--- 2/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@@ -148,7 -148,7 +148,7 @@@ static void fill_balloon(struct virtio_
                }
                set_page_pfns(vb->pfns + vb->num_pfns, page);
                vb->num_pages += VIRTIO_BALLOON_PAGES_PER_PAGE;
 -              totalram_pages--;
 +              adjust_managed_page_count(page, -1);
        }
  
        /* Did we get any? */
@@@ -163,9 -163,8 +163,9 @@@ static void release_pages_by_pfn(const 
  
        /* Find pfns pointing at start of each page, get pages and free them. */
        for (i = 0; i < num; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
 -              balloon_page_free(balloon_pfn_to_page(pfns[i]));
 -              totalram_pages++;
 +              struct page *page = balloon_pfn_to_page(pfns[i]);
 +              balloon_page_free(page);
 +              adjust_managed_page_count(page, 1);
        }
  }
  
@@@ -192,7 -191,8 +192,8 @@@ static void leak_balloon(struct virtio_
         * virtio_has_feature(vdev, VIRTIO_BALLOON_F_MUST_TELL_HOST);
         * is true, we *have* to do it in this order
         */
-       tell_host(vb, vb->deflate_vq);
+       if (vb->num_pfns != 0)
+               tell_host(vb, vb->deflate_vq);
        mutex_unlock(&vb->balloon_lock);
        release_pages_by_pfn(vb->pfns, vb->num_pfns);
  }