Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto update from Herbert Xu:
 "Here is the crypto update for 3.14:

   - Improved crypto_memneq helper
   - Use cyprto_memneq in arch-specific crypto code
   - Replaced orphaned DCP driver with Freescale MXS DCP driver
   - Added AVX/AVX2 version of AESNI-GCM encode and decode
   - Added AMD Cryptographic Coprocessor (CCP) driver
   - Misc fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (41 commits)
  crypto: aesni - fix build on x86 (32bit)
  crypto: mxs - Fix sparse non static symbol warning
  crypto: ccp - CCP device enabled/disabled changes
  crypto: ccp - Cleanup hash invocation calls
  crypto: ccp - Change data length declarations to u64
  crypto: ccp - Check for caller result area before using it
  crypto: ccp - Cleanup scatterlist usage
  crypto: ccp - Apply appropriate gfp_t type to memory allocations
  crypto: drivers - Sort drivers/crypto/Makefile
  ARM: mxs: dts: Enable DCP for MXS
  crypto: mxs - Add Freescale MXS DCP driver
  crypto: mxs - Remove the old DCP driver
  crypto: ahash - Fully restore ahash request before completing
  crypto: aesni - fix build on x86 (32bit)
  crypto: talitos - Remove redundant dev_set_drvdata
  crypto: ccp - Remove redundant dev_set_drvdata
  crypto: crypto4xx - Remove redundant dev_set_drvdata
  crypto: caam - simplify and harden key parsing
  crypto: omap-sham - Fix Polling mode for larger blocks
  crypto: tcrypt - Added speed tests for AEAD crypto alogrithms in tcrypt test suite
  ...

diff --combined MAINTAINERS
index 3229945a96b3b2782a4dda4ef28f5214fcc77127,37a613ddfb2737c625b69468df6ef5acd66c98b3..0e13d692b176dbe768faf17ba9bd3bc92fc2e756
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -484,6 -484,7 +484,6 @@@ M: Hannes Reinecke <hare@suse.de
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/aic7xxx/
 -F:    drivers/scsi/aic7xxx_old/
  
  AIMSLAB FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -538,6 -539,13 +538,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
+ AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
+ M:    Tom Lendacky <thomas.lendacky@amd.com>
+ L:    linux-crypto@vger.kernel.org
+ S:    Supported
+ F:    drivers/crypto/ccp/
+ F:    include/linux/ccp.h
+ 
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
  L:    lm-sensors@lm-sensors.org
@@@ -782,7 -790,7 +789,7 @@@ F: arch/arm/boot/dts/sama*.dt
  F:    arch/arm/boot/dts/sama*.dtsi
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
 -M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Rob Herring <robh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
@@@ -892,15 -900,20 +899,15 @@@ F:      arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 +M:    Shawn Guo <shawn.guo@linaro.org>
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
  F:    arch/arm/mach-imx/
 +F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
 -ARM/FREESCALE IMX6
 -M:    Shawn Guo <shawn.guo@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 -F:    arch/arm/mach-imx/*imx6*
 -
  ARM/FREESCALE MXS ARM ARCHITECTURE
  M:    Shawn Guo <shawn.guo@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1007,8 -1020,6 +1014,8 @@@ M:      Santosh Shilimkar <santosh.shilimkar
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 +F:    drivers/clk/keystone/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -1367,9 -1378,6 +1374,9 @@@ T:      git git://git.xilinx.com/linux-xlnx.
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
 +N:    zynq
 +N:    xilinx
 +F:    drivers/clocksource/cadence_ttc_timer.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <will.deacon@arm.com>
@@@ -1597,10 -1605,11 +1604,10 @@@ S:      Supporte
  F:      drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
 -M:    Al Viro <viro@zeniv.linux.org.uk>
  M:    Eric Paris <eparis@redhat.com>
  L:    linux-audit@redhat.com (subscribers-only)
  W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
 +T:    git git://git.infradead.org/users/eparis/audit.git
  S:    Maintained
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
@@@ -1932,8 -1941,7 +1939,8 @@@ S:      Maintaine
  F:    drivers/gpio/gpio-bt8xx.c
  
  BTRFS FILE SYSTEM
 -M:    Chris Mason <chris.mason@fusionio.com>
 +M:    Chris Mason <clm@fb.com>
 +M:    Josef Bacik <jbacik@fb.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
@@@ -2136,8 -2144,7 +2143,8 @@@ S:      Maintaine
  F:    Documentation/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +M:    Peter Chen <Peter.Chen@freescale.com>
 +T:    git://github.com/hzpeterchen/linux-usb.git
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/usb/chipidea/
@@@ -2617,7 -2624,7 +2624,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-laptop.c
  
  DELL LAPTOP SMM DRIVER
 -S:    Orphan
 +M:    Guenter Roeck <linux@roeck-us.net>
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -2636,7 -2643,7 +2643,7 @@@ DESIGNWARE USB2 DRD IP DRIVE
  M:    Paul Zimmerman <paulz@synopsys.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/dwc2/
 +F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <balbi@ti.com>
@@@ -2826,10 -2833,8 +2833,10 @@@ F:    include/uapi/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <daniel.vetter@ffwll.ch>
 +M:    Jani Nikula <jani.nikula@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
  L:    dri-devel@lists.freedesktop.org
 +Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://people.freedesktop.org/~danvet/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915/
@@@ -3333,7 -3338,6 +3340,7 @@@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
  S:    Maintained
  F:    drivers/extcon/
  F:    Documentation/extcon/
@@@ -3633,7 -3637,6 +3640,7 @@@ W:      http://en.wikipedia.org/wiki/F2F
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
  F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
  
@@@ -3768,11 -3771,9 +3775,11 @@@ F:    include/uapi/linux/gigaset_dev.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
 -S:    Maintained
 +M:    Alexandre Courbot <gnurou@gmail.com>
  L:    linux-gpio@vger.kernel.org
 -F:    Documentation/gpio.txt
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 +S:    Maintained
 +F:    Documentation/gpio/
  F:    drivers/gpio/
  F:    include/linux/gpio*
  F:    include/asm-generic/gpio.h
@@@ -3840,12 -3841,6 +3847,12 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/gspca/
  
 +GUID PARTITION TABLE (GPT)
 +M:    Davidlohr Bueso <davidlohr@hp.com>
 +L:    linux-efi@vger.kernel.org
 +S:    Maintained
 +F:    block/partitions/efi.*
 +
  STK1160 USB VIDEO CAPTURE DRIVER
  M:    Ezequiel Garcia <elezegarcia@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -4055,26 -4050,12 +4062,26 @@@ W:   http://artax.karlin.mff.cuni.cz/~mik
  S:    Maintained
  F:    fs/hpfs/
  
 +HSI SUBSYSTEM
 +M:    Sebastian Reichel <sre@debian.org>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-hsi
 +F:    drivers/hsi/
 +F:    include/linux/hsi/
 +F:    include/uapi/linux/hsi/
 +
  HSO 3G MODEM DRIVER
  M:    Jan Dumon <j.dumon@option.com>
  W:    http://www.pharscape.org
  S:    Maintained
  F:    drivers/net/usb/hso.c
  
 +HSR NETWORK PROTOCOL
 +M:    Arvid Brodin <arvid.brodin@alten.se>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/hsr/
 +
  HTCPEN TOUCHSCREEN DRIVER
  M:    Pau Oliva Fora <pof@eslack.org>
  L:    linux-input@vger.kernel.org
@@@ -4481,8 -4462,10 +4488,8 @@@ M:     Bruce Allan <bruce.w.allan@intel.com
  M:    Carolyn Wyborny <carolyn.wyborny@intel.com>
  M:    Don Skidmore <donald.c.skidmore@intel.com>
  M:    Greg Rose <gregory.v.rose@intel.com>
 -M:    Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
  M:    Alex Duyck <alexander.h.duyck@intel.com>
  M:    John Ronciak <john.ronciak@intel.com>
 -M:    Tushar Dave <tushar.n.dave@intel.com>
  L:    e1000-devel@lists.sourceforge.net
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -4915,7 -4898,7 +4922,7 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Gleb Natapov <gleb@redhat.com>
 +M:    Gleb Natapov <gleb@kernel.org>
  M:    Paolo Bonzini <pbonzini@redhat.com>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org
@@@ -5141,11 -5124,6 +5148,11 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBLOCKDEP
 +M:    Sasha Levin <sasha.levin@oracle.com>
 +S:    Maintained
 +F:    tools/lib/lockdep/
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
@@@ -5290,7 -5268,7 +5297,7 @@@ S:      Maintaine
  F:    Documentation/lockdep*.txt
  F:    Documentation/lockstat.txt
  F:    include/linux/lockdep.h
 -F:    kernel/lockdep*
 +F:    kernel/locking/
  
  LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
  M:    "Richard Russon (FlatCap)" <ldm@flatcap.org>
@@@ -5931,21 -5909,12 +5938,21 @@@ M:   Steffen Klassert <steffen.klassert@s
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  M:    "David S. Miller" <davem@davemloft.net>
  L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
  S:    Maintained
  F:    net/xfrm/
  F:    net/key/
  F:    net/ipv4/xfrm*
 +F:    net/ipv4/esp4.c
 +F:    net/ipv4/ah4.c
 +F:    net/ipv4/ipcomp.c
 +F:    net/ipv4/ip_vti.c
  F:    net/ipv6/xfrm*
 +F:    net/ipv6/esp6.c
 +F:    net/ipv6/ah6.c
 +F:    net/ipv6/ipcomp6.c
 +F:    net/ipv6/ip6_vti.c
  F:    include/uapi/linux/xfrm.h
  F:    include/net/xfrm.h
  
@@@ -6011,10 -5980,10 +6018,10 @@@ F:   drivers/nfc
  F:    include/linux/platform_data/pn544.h
  
  NFS, SUNRPC, AND LOCKD CLIENTS
 -M:    Trond Myklebust <Trond.Myklebust@netapp.com>
 +M:    Trond Myklebust <trond.myklebust@primarydata.com>
  L:    linux-nfs@vger.kernel.org
  W:    http://client.linux-nfs.org
 -T:    git git://git.linux-nfs.org/pub/linux/nfs-2.6.git
 +T:    git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
  S:    Maintained
  F:    fs/lockd/
  F:    fs/nfs/
@@@ -6266,7 -6235,7 +6273,7 @@@ F:      drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <grant.likely@linaro.org>
 -M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Rob Herring <robh+dt@kernel.org>
  L:    devicetree@vger.kernel.org
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -6278,11 -6247,11 +6285,11 @@@ K:   of_get_propert
  K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 -M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Rob Herring <robh+dt@kernel.org>
  M:    Pawel Moll <pawel.moll@arm.com>
  M:    Mark Rutland <mark.rutland@arm.com>
 -M:    Stephen Warren <swarren@wwwdotorg.org>
  M:    Ian Campbell <ijc+devicetree@hellion.org.uk>
 +M:    Kumar Gala <galak@codeaurora.org>
  L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/
@@@ -6492,52 -6461,19 +6499,52 @@@ F:   drivers/pci
  F:    include/linux/pci*
  F:    arch/x86/pci/
  
 +PCI DRIVER FOR IMX6
 +M:    Richard Zhu <r65037@freescale.com>
 +M:    Shawn Guo <shawn.guo@linaro.org>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*imx6*
 +
 +PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 +M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Jason Cooper <jason@lakedaemon.net>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*mvebu*
 +
  PCI DRIVER FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    linux-tegra@vger.kernel.org
 +L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
  F:    drivers/pci/host/pci-tegra.c
  
 +PCI DRIVER FOR RENESAS R-CAR
 +M:    Simon Horman <horms@verge.net.au>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-sh@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pci/host/*rcar*
 +
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <jg1.han@samsung.com>
  L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/pci/host/pci-exynos.c
  
 +PCI DRIVER FOR SYNOPSIS DESIGNWARE
 +M:    Mohit Kumar <mohit.kumar@st.com>
 +M:    Jingoo Han <jg1.han@samsung.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pci/host/*designware*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -6711,7 -6647,7 +6718,7 @@@ F:      include/linux/timer
  F:    kernel/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Anton Vorontsov <anton@enomsg.org>
 +M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
@@@ -6930,7 -6866,8 +6937,7 @@@ S:      Maintaine
  F:    drivers/scsi/qla1280.[ch]
  
  QLOGIC QLA2XXX FC-SCSI DRIVER
 -M:    Andrew Vasquez <andrew.vasquez@qlogic.com>
 -M:    linux-driver@qlogic.com
 +M:    qla2xxx-upstream@qlogic.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla2xxx
@@@ -7103,12 -7040,6 +7110,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcu/torture.c
  
 +RCUTORTURE TEST FRAMEWORK
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    tools/testing/selftests/rcutorture
 +
  RDC R-321X SoC
  M:    Florian Fainelli <florian@openwrt.org>
  S:    Maintained
@@@ -7461,6 -7392,7 +7468,6 @@@ S:      Maintaine
  F:    kernel/sched/
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
 -F:    kernel/wait.c
  F:    include/linux/wait.h
  
  SCORE ARCHITECTURE
@@@ -7490,9 -7422,8 +7497,9 @@@ F:      include/scsi/srp.
  SCSI SG DRIVER
  M:    Doug Gilbert <dgilbert@interlog.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.torque.net/sg
 +W:    http://sg.danny.cz/sg
  S:    Maintained
 +F:    Documentation/scsi/scsi-generic.txt
  F:    drivers/scsi/sg.c
  F:    include/scsi/sg.h
  
@@@ -8745,10 -8676,14 +8752,10 @@@ S:   Odd fixe
  F:    drivers/media/usb/tm6000/
  
  TPM DEVICE DRIVER
 -M:    Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
 -M:    Ashley Lai <ashley@ashleylai.com>
  M:    Peter Huewe <peterhuewe@gmx.de>
 -M:    Rajiv Andrade <mail@srajiv.net>
 -W:    http://tpmdd.sourceforge.net
 +M:    Ashley Lai <ashley@ashleylai.com>
  M:    Marcel Selhorst <tpmdd@selhorst.net>
 -M:    Sirrix AG <tpmdd@sirrix.com>
 -W:    http://www.sirrix.com
 +W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -9238,7 -9173,6 +9245,7 @@@ F:      include/media/videobuf2-
  
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit.shah@redhat.com>
 +L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    drivers/char/virtio_console.c
@@@ -9248,7 -9182,6 +9255,7 @@@ F:      include/uapi/linux/virtio_console.
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    Rusty Russell <rusty@rustcorp.com.au>
  M:    "Michael S. Tsirkin" <mst@redhat.com>
 +L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    drivers/virtio/
@@@ -9261,7 -9194,6 +9268,7 @@@ F:      include/uapi/linux/virtio_*.
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
 +L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -9559,7 -9491,6 +9566,7 @@@ M:      Konrad Rzeszutek Wilk <konrad.wilk@o
  M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
  M:    David Vrabel <david.vrabel@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9606,7 -9537,7 +9613,7 @@@ F:      drivers/xen/*swiotlb
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Dave Chinner <dchinner@fromorbit.com>
 +M:    Dave Chinner <david@fromorbit.com>
  M:    Ben Myers <bpm@sgi.com>
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com

diff --combined include/linux/compiler-intel.h
index dc1bd3dcf11fd6b72f93c5d3d9b674957bb705a0,e784f57077497f87e707f66f2718cfc2bba3dd84..5529c52394219a25f274143aaab152bed8b4e157
--- 1/include/linux/compiler-intel.h
--- 2/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@@ -15,6 -15,7 +15,7 @@@
   */
  #undef barrier
  #undef RELOC_HIDE
+ #undef OPTIMIZER_HIDE_VAR
  
  #define barrier() __memory_barrier()
  
@@@ -23,11 -24,19 +24,17 @@@
       __ptr = (unsigned long) (ptr);                           \
      (typeof(ptr)) (__ptr + (off)); })
  
+ /* This should act as an optimization barrier on var.
+  * Given that this compiler does not have inline assembly, a compiler barrier
+  * is the best we can do.
+  */
+ #define OPTIMIZER_HIDE_VAR(var) barrier()
+ 
  /* Intel ECC compiler doesn't support __builtin_types_compatible_p() */
  #define __must_be_array(a) 0
  
  #endif
  
 -#define uninitialized_var(x) x
 -
  #ifndef __HAVE_BUILTIN_BSWAP16__
  /* icc has this, but it's called _bswap16 */
  #define __HAVE_BUILTIN_BSWAP16__

diff --combined include/linux/compiler.h
index fe7a686dfd8dc3b87dcc35d0bdd3e50a47324014,a2329c5e62062fee5157754b3cd3cce6494d661d..2472740d7ab2201f58d68ce864448b3def30cdaf
--- 1/include/linux/compiler.h
--- 2/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@@ -170,6 -170,10 +170,10 @@@ void ftrace_likely_update(struct ftrace
      (typeof(ptr)) (__ptr + (off)); })
  #endif
  
+ #ifndef OPTIMIZER_HIDE_VAR
+ #define OPTIMIZER_HIDE_VAR(var) barrier()
+ #endif
+ 
  /* Not-quite-unique ID. */
  #ifndef __UNIQUE_ID
  # define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __LINE__)
@@@ -298,11 -302,6 +302,11 @@@
  # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
  #endif
  
 +/* Is this type a native word size -- useful for atomic operations */
 +#ifndef __native_word
 +# define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
 +#endif
 +
  /* Compile time object size, -1 for unknown */
  #ifndef __compiletime_object_size
  # define __compiletime_object_size(obj) -1
@@@ -342,10 -341,6 +346,10 @@@
  #define compiletime_assert(condition, msg) \
        _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__)
  
 +#define compiletime_assert_atomic_type(t)                             \
 +      compiletime_assert(__native_word(t),                            \
 +              "Need native word sized stores/loads for atomicity.")
 +
  /*
   * Prevent the compiler from merging or refetching accesses.  The compiler
   * is also forbidden from reordering successive instances of ACCESS_ONCE(),