Merge remote-tracking branch 'crypto/master'

Conflicts:
	crypto/Kconfig

diff --combined MAINTAINERS
index a1a0f95e4e294cb14d99c334b31fecd1d3c0e4cf,a43769e45c4edaac86f7377e66a3741d3427838d..62263544b9cccf11829753977e2220afd0dfac91
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -595,6 -595,7 +595,6 @@@ M: Will Deacon <will.deacon@arm.com
  S:    Maintained
  F:    arch/arm/kernel/perf_event*
  F:    arch/arm/oprofile/common.c
 -F:    arch/arm/kernel/pmu.c
  F:    arch/arm/include/asm/pmu.h
  F:    arch/arm/kernel/hw_breakpoint.c
  F:    arch/arm/include/asm/hw_breakpoint.h
@@@ -826,24 -827,24 +826,24 @@@ F:      arch/arm/mach-pxa/colibri-pxa270-inc
  
  ARM/INTEL IOP32X ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP33X ARM ARCHITECTURE
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IOP13XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
  ARM/INTEL IQ81342EX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
@@@ -868,7 -869,7 +868,7 @@@ F: drivers/pcmcia/pxa2xx_stargate2.
  
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
@@@ -924,14 -925,14 +924,14 @@@ S:      Maintaine
  
  ARM/NOMADIK ARCHITECTURE
  M:    Alessandro Rubini <rubini@unipv.it>
 -M:    Linus Walleij <linus.walleij@stericsson.com>
 +M:    Linus Walleij <linus.walleij@linaro.org>
  M:    STEricsson <STEricsson_nomadik_linux@list.st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-nomadik/
  F:    arch/arm/plat-nomadik/
  F:    drivers/i2c/busses/i2c-nomadik.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
  
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
@@@ -1145,7 -1146,7 +1145,7 @@@ F:      drivers/usb/host/ehci-w90x900.
  F:    drivers/video/nuc900fb.c
  
  ARM/U300 MACHINE SUPPORT
 -M:    Linus Walleij <linus.walleij@stericsson.com>
 +M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/mach-u300/
@@@ -1160,20 -1161,15 +1160,20 @@@ T:   git git://git.kernel.org/pub/scm/lin
  
  ARM/Ux500 ARM ARCHITECTURE
  M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
 -M:    Linus Walleij <linus.walleij@stericsson.com>
 +M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ux500/
 +F:    drivers/clocksource/clksrc-dbx500-prcmu.c
  F:    drivers/dma/ste_dma40*
 +F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/mfd/abx500*
  F:    drivers/mfd/ab8500*
 -F:    drivers/mfd/stmpe*
 +F:    drivers/mfd/dbx500*
 +F:    drivers/mfd/db8500*
 +F:    drivers/pinctrl/pinctrl-nomadik*
  F:    drivers/rtc/rtc-ab8500.c
 +F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
  ARM/VFP SUPPORT
@@@ -1208,12 -1204,6 +1208,12 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM64 PORT (AARCH64 ARCHITECTURE)
 +M:    Catalin Marinas <catalin.marinas@arm.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <george.joseph@fairview5.com>
  L:    lm-sensors@lm-sensors.org
@@@ -1237,9 -1227,9 +1237,9 @@@ S:      Maintaine
  F:    drivers/hwmon/asb100.c
  
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  W:    http://sourceforge.net/projects/xscaleiop
 -S:    Supported
 +S:    Maintained
  F:    Documentation/crypto/async-tx-api.txt
  F:    crypto/async_tx/
  F:    drivers/dma/
@@@ -2222,7 -2212,7 +2222,7 @@@ S:      Maintaine
  F:    drivers/scsi/tmscsim.*
  
  DC395x SCSI driver
 -M:    Oliver Neukum <oliver@neukum.name>
 +M:    Oliver Neukum <oliver@neukum.org>
  M:    Ali Akcaagac <aliakc@web.de>
  M:    Jamie Lenehan <lenehan@twibble.org>
  W:    http://twibble.org/dist/dc395x/
@@@ -2369,7 -2359,7 +2369,7 @@@ T:      git git://git.linaro.org/people/sumi
  
  DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
  M:    Vinod Koul <vinod.koul@intel.com>
 -M:    Dan Williams <dan.j.williams@intel.com>
 +M:    Dan Williams <djbw@fb.com>
  S:    Supported
  F:    drivers/dma/
  F:    include/linux/dma*
@@@ -2383,6 -2373,11 +2383,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/dme1737
  F:    drivers/hwmon/dme1737.c
  
 -DOCBOOK FOR DOCUMENTATION
 -M:    Randy Dunlap <rdunlap@xenotime.net>
 -S:    Maintained
 -F:    scripts/kernel-doc
 -
  DOCKING STATION DRIVER
  M:    Shaohua Li <shaohua.li@intel.com>
  L:    linux-acpi@vger.kernel.org
@@@ -2778,8 -2773,8 +2778,8 @@@ FC0011 TUNER DRIVE
  M:    Michael Buesch <m@bues.ch>
  L:    linux-media@vger.kernel.org
  S:    Maintained
 -F:    drivers/media/common/tuners/fc0011.h
 -F:    drivers/media/common/tuners/fc0011.c
 +F:    drivers/media/tuners/fc0011.h
 +F:    drivers/media/tuners/fc0011.c
  
  FANOTIFY
  M:    Eric Paris <eparis@redhat.com>
@@@ -3099,7 -3094,7 +3099,7 @@@ F:      include/linux/gigaset_dev.
  
  GPIO SUBSYSTEM
  M:    Grant Likely <grant.likely@secretlab.ca>
 -M:    Linus Walleij <linus.walleij@stericsson.com>
 +M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  T:    git git://git.secretlab.ca/git/linux-2.6.git
  F:    Documentation/gpio.txt
@@@ -3124,49 -3119,49 +3124,49 @@@ M:   Frank Zago <frank@zago.net
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/finepix.c
 +F:    drivers/media/usb/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <o.lorin@laposte.net>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/gl860/
 +F:    drivers/media/usb/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/m5602/
 +F:    drivers/media/usb/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/pac207.c
 +F:    drivers/media/usb/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <brijohn@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/sn9c20x.c
 +F:    drivers/media/usb/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <lcostantino@gmail.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/t613.c
 +F:    drivers/media/usb/gspca/t613.c
  
  GSPCA USB WEBCAM DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/
 +F:    drivers/media/usb/gspca/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <frank@f-seidel.de>
@@@ -3420,6 -3415,18 +3420,18 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
+ IBM Power in-Nest Crypto Acceleration
+ M:    Kent Yoder <key@linux.vnet.ibm.com>
+ L:    linux-crypto@vger.kernel.org
+ S:    Supported
+ F:    drivers/crypto/nx/
+ 
+ IBM Power 842 compression accelerator
+ M:    Robert Jennings <rcj@linux.vnet.ibm.com>
+ S:    Supported
+ F:    drivers/crypto/nx/nx-842.c
+ F:    include/linux/nx842.h
+ 
  IBM Power Linux RAID adapter
  M:    Brian King <brking@us.ibm.com>
  S:    Supported
@@@ -3552,6 -3559,7 +3564,6 @@@ K:      \b(ABS|SYN)_MT
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
 -M:    Dan Williams <dan.j.williams@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  M:    Ed Nadolski <edmund.nadolski@intel.com>
  L:    linux-scsi@vger.kernel.org
@@@ -3594,8 -3602,8 +3606,8 @@@ F:      arch/x86/kernel/microcode_core.
  F:    arch/x86/kernel/microcode_intel.c
  
  INTEL I/OAT DMA DRIVER
 -M:    Dan Williams <dan.j.williams@intel.com>
 -S:    Supported
 +M:    Dan Williams <djbw@fb.com>
 +S:    Maintained
  F:    drivers/dma/ioat*
  
  INTEL IOMMU (VT-d)
@@@ -3607,8 -3615,8 +3619,8 @@@ F:      drivers/iommu/intel-iommu.
  F:    include/linux/intel-iommu.h
  
  INTEL IOP-ADMA DMA DRIVER
 -M:    Dan Williams <dan.j.williams@intel.com>
 -S:    Maintained
 +M:    Dan Williams <djbw@fb.com>
 +S:    Odd fixes
  F:    drivers/dma/iop-adma.c
  
  INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
@@@ -4537,7 -4545,7 +4549,7 @@@ S:      Supporte
  F:    arch/microblaze/
  
  MICROTEK X6 SCANNER
 -M:    Oliver Neukum <oliver@neukum.name>
 +M:    Oliver Neukum <oliver@neukum.org>
  S:    Maintained
  F:    drivers/usb/image/microtek.*
  
@@@ -5320,12 -5328,6 +5332,12 @@@ L:    linux-mtd@lists.infradead.or
  S:    Maintained
  F:    drivers/mtd/devices/phram.c
  
 +PICOLCD HID DRIVER
 +M:    Bruno Prémont <bonbons@linux-vserver.org>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    drivers/hid/hid-picolcd*
 +
  PICOXCELL SUPPORT
  M:    Jamie Iles <jamie@jamieiles.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -5339,15 -5341,14 +5351,15 @@@ PIN CONTROL SUBSYSTE
  M:    Linus Walleij <linus.walleij@linaro.org>
  S:    Maintained
  F:    drivers/pinctrl/
 +F:    include/linux/pinctrl/
  
  PIN CONTROLLER - ST SPEAR
 -M:     Viresh Kumar <viresh.linux@gmail.com>
 +M:    Viresh Kumar <viresh.linux@gmail.com>
  L:    spear-devel@list.st.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
 -F:    driver/pinctrl/spear/
 +F:    drivers/pinctrl/spear/
  
  PKTCDVD DRIVER
  M:    Peter Osterlund <petero2@telia.com>
@@@ -5507,18 -5508,6 +5519,18 @@@ L:    cbe-oss-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 +PSTORE FILESYSTEM
 +M:    Anton Vorontsov <cbouatmailru@gmail.com>
 +M:    Colin Cross <ccross@android.com>
 +M:    Kees Cook <keescook@chromium.org>
 +M:    Tony Luck <tony.luck@intel.com>
 +S:    Maintained
 +T:    git git://git.infradead.org/users/cbou/linux-pstore.git
 +F:    fs/pstore/
 +F:    include/linux/pstore*
 +F:    drivers/firmware/efivars.c
 +F:    drivers/acpi/apei/erst.c
 +
  PTP HARDWARE CLOCK SUPPORT
  M:    Richard Cochran <richardcochran@gmail.com>
  S:    Maintained
@@@ -5548,7 -5537,7 +5560,7 @@@ W:      http://www.isely.net/pvrusb2
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/README.pvrusb2
 -F:    drivers/media/video/pvrusb2/
 +F:    drivers/media/usb/pvrusb2/
  
  PWM SUBSYSTEM
  M:    Thierry Reding <thierry.reding@avionic-design.de>
@@@ -5979,7 -5968,7 +5991,7 @@@ M:      Huang Shijie <shijie8@gmail.com
  M:    Kang Yong <kangyong@telegent.com>
  M:    Zhang Xiaobing <xbzhang@telegent.com>
  S:    Supported
 -F:    drivers/media/video/tlg2300
 +F:    drivers/media/usb/tlg2300
  
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwane@arm.linux.org.uk>
@@@ -6816,8 -6805,6 +6828,8 @@@ F:      drivers/char/tlclk.
  
  TENSILICA XTENSA PORT (xtensa)
  M:    Chris Zankel <chris@zankel.net>
 +M:    Max Filippov <jcmvbkbc@gmail.com>
 +L:    linux-xtensa@linux-xtensa.org
  S:    Maintained
  F:    arch/xtensa/
  
@@@ -7096,7 -7083,7 +7108,7 @@@ F:      include/linux/mtd/ubi.
  F:    include/mtd/ubi-user.h
  
  USB ACM DRIVER
 -M:    Oliver Neukum <oliver@neukum.name>
 +M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    Documentation/usb/acm.txt
@@@ -7117,7 -7104,7 +7129,7 @@@ S:      Supporte
  F:    drivers/block/ub.c
  
  USB CDC ETHERNET DRIVER
 -M:    Oliver Neukum <oliver@neukum.name>
 +M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/net/usb/cdc_*.c
@@@ -7190,7 -7177,7 +7202,7 @@@ F:      drivers/usb/host/isp116x
  F:    include/linux/usb/isp116x.h
  
  USB KAWASAKI LSI DRIVER
 -M:    Oliver Neukum <oliver@neukum.name>
 +M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/usb/serial/kl5kusb105.*
@@@ -7308,12 -7295,6 +7320,12 @@@ W:    http://www.connecttech.co
  S:    Supported
  F:    drivers/usb/serial/whiteheat*
  
 +USB SMSC75XX ETHERNET DRIVER
 +M:    Steve Glendinning <steve.glendinning@shawell.net>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/usb/smsc75xx.*
 +
  USB SMSC95XX ETHERNET DRIVER
  M:    Steve Glendinning <steve.glendinning@shawell.net>
  L:    netdev@vger.kernel.org
@@@ -7328,7 -7309,7 +7340,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/sn9c102.txt
 -F:    drivers/media/video/sn9c102/
 +F:    drivers/media/usb/sn9c102/
  
  USB SUBSYSTEM
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -7363,7 -7344,7 +7375,7 @@@ L:      linux-media@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
 -F:    drivers/media/video/uvc/
 +F:    drivers/media/usb/uvc/
  
  USB W996[87]CF DRIVER
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
@@@ -7402,7 -7383,7 +7414,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  F:    Documentation/video4linux/zr364xx.txt
 -F:    drivers/media/video/zr364xx.c
 +F:    drivers/media/usb/zr364xx.c
  
  USER-MODE LINUX (UML)
  M:    Jeff Dike <jdike@addtoit.com>
@@@ -7413,7 -7394,6 +7425,7 @@@ W:      http://user-mode-linux.sourceforge.n
  S:    Maintained
  F:    Documentation/virtual/uml/
  F:    arch/um/
 +F:    arch/x86/um/
  F:    fs/hostfs/
  F:    fs/hppfs/
  
@@@ -7696,28 -7676,23 +7708,28 @@@ S:   Supporte
  F:    Documentation/hwmon/wm83??
  F:    arch/arm/mach-s3c64xx/mach-crag6410*
  F:    drivers/clk/clk-wm83*.c
 +F:    drivers/extcon/extcon-arizona.c
  F:    drivers/leds/leds-wm83*.c
  F:    drivers/gpio/gpio-*wm*.c
 +F:    drivers/gpio/gpio-arizona.c
  F:    drivers/hwmon/wm83??-hwmon.c
  F:    drivers/input/misc/wm831x-on.c
  F:    drivers/input/touchscreen/wm831x-ts.c
  F:    drivers/input/touchscreen/wm97*.c
 -F:    drivers/mfd/wm8*.c
 +F:    drivers/mfd/arizona*
 +F:    drivers/mfd/wm*.c
  F:    drivers/power/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
  F:    drivers/regulator/wm8*.c
  F:    drivers/video/backlight/wm83*_bl.c
  F:    drivers/watchdog/wm83*_wdt.c
 +F:    include/linux/mfd/arizona/
  F:    include/linux/mfd/wm831x/
  F:    include/linux/mfd/wm8350/
  F:    include/linux/mfd/wm8400*
  F:    include/linux/wm97xx.h
  F:    include/sound/wm????.h
 +F:    sound/soc/codecs/arizona.?
  F:    sound/soc/codecs/wm*
  
  WORKQUEUE

diff --combined arch/arm/Makefile
index a051dfbdd7db07fb12db913d85050a5bb0ea7167,46038d756bf6439098c0a2cb07284660ad6de5cc..6ed5381d0d86f3cdbf3c5757c8c061b118d85bf0
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -255,6 -255,7 +255,7 @@@ core-$(CONFIG_VFP)         += arch/arm/vfp
  # If we have a machine-specific directory, then include it in the build.
  core-y                                += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
  core-y                                += arch/arm/net/
+ core-y                                += arch/arm/crypto/
  core-y                                += $(machdirs) $(platdirs)
  
  drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/
@@@ -284,10 -285,10 +285,10 @@@ zImage Image xipImage bootpImage uImage
  zinstall uinstall install: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
  
 -%.dtb:
 +%.dtb: scripts
        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
  
 -dtbs:
 +dtbs: scripts
        $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
  
  # We use MRPROPER_FILES and CLEAN_FILES now

diff --combined arch/powerpc/configs/ppc64_defconfig
index 06b56245d78c090b0007668fff2b3446cb52ac0e,2d9150a1c2bab41f3e240148ad10e12e13e0e165..de7c4c53f5cf4746659fb646f116c2fa25a964d2
--- 1/arch/powerpc/configs/ppc64_defconfig
--- 2/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@@ -92,6 -92,7 +92,6 @@@ CONFIG_NETFILTER_XT_TARGET_DSCP=
  CONFIG_NETFILTER_XT_TARGET_MARK=m
  CONFIG_NETFILTER_XT_TARGET_NFLOG=m
  CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
  CONFIG_NETFILTER_XT_TARGET_TPROXY=m
  CONFIG_NETFILTER_XT_TARGET_TRACE=m
  CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
@@@ -486,7 -487,8 +486,8 @@@ CONFIG_CRYPTO_TWOFISH=
  CONFIG_CRYPTO_LZO=m
  # CONFIG_CRYPTO_ANSI_CPRNG is not set
  CONFIG_CRYPTO_HW=y
- CONFIG_CRYPTO_DEV_NX=m
+ CONFIG_CRYPTO_DEV_NX=y
+ CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
  CONFIG_VIRTUALIZATION=y
  CONFIG_KVM_BOOK3S_64=m
  CONFIG_KVM_BOOK3S_64_HV=y

diff --combined arch/powerpc/kernel/prom_init.c
index ce68278a5d73108dfb67b9e2a2035da2e172a224,9ec5e5525777a7ce1769092e54b983d366fa6b5c..ff1e28131f9b29a19d432241223d6cee3df8523c
--- 1/arch/powerpc/kernel/prom_init.c
--- 2/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@@ -705,6 -705,7 +705,7 @@@ static void __init early_cmdline_parse(
  #endif
  #define OV5_TYPE1_AFFINITY    0x80    /* Type 1 NUMA affinity */
  #define OV5_PFO_HW_RNG                0x80    /* PFO Random Number Generator */
+ #define OV5_PFO_HW_842                0x40    /* PFO Compression Accelerator */
  #define OV5_PFO_HW_ENCR               0x20    /* PFO Encryption Accelerator */
  
  /* Option Vector 6: IBM PAPR hints */
@@@ -774,8 -775,7 +775,7 @@@ static unsigned char ibm_architecture_v
        0,
        0,
        0,
-       OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR,
- 
+       OV5_PFO_HW_RNG | OV5_PFO_HW_ENCR | OV5_PFO_HW_842,
        /* option vector 6: IBM PAPR hints */
        4 - 2,                          /* length */
        0,
@@@ -1691,7 -1691,7 +1691,7 @@@ static void __init prom_initialize_tce_
                 * else will impact performance, so we always allocate 8MB.
                 * Anton
                 */
 -              if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p))
 +              if (pvr_version_is(PVR_POWER4) || pvr_version_is(PVR_POWER4p))
                        minsize = 8UL << 20;
                else
                        minsize = 4UL << 20;

diff --combined crypto/Kconfig
index 94f232f96d036da6827a6b50c1f46379ff75f840,27307981f88efed5c9dbb9d328616a6f2220fdfb..8a197304b41560eaec7aa4da11356f6b17fda96d
--- 1/crypto/Kconfig
--- 2/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -336,15 -336,6 +336,15 @@@ config CRYPTO_CRC32C_INTE
          gain performance compared with software implementation.
          Module will be crc32c-intel.
  
 +config CRYPTO_CRC32C_SPARC64
 +      tristate "CRC32c CRC algorithm (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_HASH
 +      select CRC32
 +      help
 +        CRC32c CRC algorithm implemented using sparc64 crypto instructions,
 +        when available.
 +
  config CRYPTO_GHASH
        tristate "GHASH digest algorithm"
        select CRYPTO_GF128MUL
@@@ -363,15 -354,6 +363,15 @@@ config CRYPTO_MD
        help
          MD5 message digest algorithm (RFC1321).
  
 +config CRYPTO_MD5_SPARC64
 +      tristate "MD5 digest algorithm (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_MD5
 +      select CRYPTO_HASH
 +      help
 +        MD5 message digest algorithm (RFC1321) implemented
 +        using sparc64 crypto instructions, when available.
 +
  config CRYPTO_MICHAEL_MIC
        tristate "Michael MIC keyed digest algorithm"
        select CRYPTO_HASH
@@@ -451,15 -433,15 +451,24 @@@ config CRYPTO_SHA1_SSSE
          using Supplemental SSE3 (SSSE3) instructions or Advanced Vector
          Extensions (AVX), when available.
  
+ config CRYPTO_SHA1_ARM
+       tristate "SHA1 digest algorithm (ARM-asm)"
+       depends on ARM
+       select CRYPTO_SHA1
+       select CRYPTO_HASH
+       help
+         SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
+         using optimized ARM assembler.
+ 
 +config CRYPTO_SHA1_SPARC64
 +      tristate "SHA1 digest algorithm (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_SHA1
 +      select CRYPTO_HASH
 +      help
 +        SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented
 +        using sparc64 crypto instructions, when available.
 +
  config CRYPTO_SHA256
        tristate "SHA224 and SHA256 digest algorithm"
        select CRYPTO_HASH
@@@ -472,15 -454,6 +481,15 @@@
          This code also includes SHA-224, a 224 bit hash with 112 bits
          of security against collision attacks.
  
 +config CRYPTO_SHA256_SPARC64
 +      tristate "SHA224 and SHA256 digest algorithm (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_SHA256
 +      select CRYPTO_HASH
 +      help
 +        SHA-256 secure hash standard (DFIPS 180-2) implemented
 +        using sparc64 crypto instructions, when available.
 +
  config CRYPTO_SHA512
        tristate "SHA384 and SHA512 digest algorithms"
        select CRYPTO_HASH
@@@ -493,15 -466,6 +502,15 @@@
          This code also includes SHA-384, a 384 bit hash with 192 bits
          of security against collision attacks.
  
 +config CRYPTO_SHA512_SPARC64
 +      tristate "SHA384 and SHA512 digest algorithm (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_SHA512
 +      select CRYPTO_HASH
 +      help
 +        SHA-512 secure hash standard (DFIPS 180-2) implemented
 +        using sparc64 crypto instructions, when available.
 +
  config CRYPTO_TGR192
        tristate "Tiger digest algorithms"
        select CRYPTO_HASH
@@@ -609,6 -573,8 +618,8 @@@ config CRYPTO_AES_NI_INTE
        select CRYPTO_CRYPTD
        select CRYPTO_ABLK_HELPER_X86
        select CRYPTO_ALGAPI
+       select CRYPTO_LRW
+       select CRYPTO_XTS
        help
          Use Intel AES-NI instructions for AES algorithm.
  
@@@ -633,34 -599,30 +644,58 @@@
          ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
          acceleration for CTR.
  
+ config CRYPTO_AES_ARM
+       tristate "AES cipher algorithms (ARM-asm)"
+       depends on ARM
+       select CRYPTO_ALGAPI
+       select CRYPTO_AES
+       help
+         Use optimized AES assembler routines for ARM platforms.
+ 
+         AES cipher algorithms (FIPS-197). AES uses the Rijndael
+         algorithm.
+ 
+         Rijndael appears to be consistently a very good performer in
+         both hardware and software across a wide range of computing
+         environments regardless of its use in feedback or non-feedback
+         modes. Its key setup time is excellent, and its key agility is
+         good. Rijndael's very low memory requirements make it very well
+         suited for restricted-space environments, in which it also
+         demonstrates excellent performance. Rijndael's operations are
+         among the easiest to defend against power and timing attacks.
+ 
+         The AES specifies three key sizes: 128, 192 and 256 bits
+ 
+         See <http://csrc.nist.gov/encryption/aes/> for more information.
+ 
 +config CRYPTO_AES_SPARC64
 +      tristate "AES cipher algorithms (SPARC64)"
 +      depends on SPARC64
 +      select CRYPTO_CRYPTD
 +      select CRYPTO_ALGAPI
 +      help
 +        Use SPARC64 crypto opcodes for AES algorithm.
 +
 +        AES cipher algorithms (FIPS-197). AES uses the Rijndael
 +        algorithm.
 +
 +        Rijndael appears to be consistently a very good performer in
 +        both hardware and software across a wide range of computing
 +        environments regardless of its use in feedback or non-feedback
 +        modes. Its key setup time is excellent, and its key agility is
 +        good. Rijndael's very low memory requirements make it very well
 +        suited for restricted-space environments, in which it also
 +        demonstrates excellent performance. Rijndael's operations are
 +        among the easiest to defend against power and timing attacks.
 +
 +        The AES specifies three key sizes: 128, 192 and 256 bits
 +
 +        See <http://csrc.nist.gov/encryption/aes/> for more information.
 +
 +        In addition to AES cipher algorithm support, the acceleration
 +        for some popular block cipher mode is supported too, including
 +        ECB and CBC.
 +
  config CRYPTO_ANUBIS
        tristate "Anubis cipher algorithm"
        select CRYPTO_ALGAPI
@@@ -758,22 -720,6 +793,22 @@@ config CRYPTO_CAMELLIA_X86_6
          See also:
          <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
  
 +config CRYPTO_CAMELLIA_SPARC64
 +      tristate "Camellia cipher algorithm (SPARC64)"
 +      depends on SPARC64
 +      depends on CRYPTO
 +      select CRYPTO_ALGAPI
 +      help
 +        Camellia cipher algorithm module (SPARC64).
 +
 +        Camellia is a symmetric key block cipher developed jointly
 +        at NTT and Mitsubishi Electric Corporation.
 +
 +        The Camellia specifies three key sizes: 128, 192 and 256 bits.
 +
 +        See also:
 +        <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 +
  config CRYPTO_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
        select CRYPTO_ALGAPI
@@@ -781,6 -727,20 +816,20 @@@
          The CAST5 encryption algorithm (synonymous with CAST-128) is
          described in RFC2144.
  
+ config CRYPTO_CAST5_AVX_X86_64
+       tristate "CAST5 (CAST-128) cipher algorithm (x86_64/AVX)"
+       depends on X86 && 64BIT
+       select CRYPTO_ALGAPI
+       select CRYPTO_CRYPTD
+       select CRYPTO_ABLK_HELPER_X86
+       select CRYPTO_CAST5
+       help
+         The CAST5 encryption algorithm (synonymous with CAST-128) is
+         described in RFC2144.
+ 
+         This module provides the Cast5 cipher algorithm that processes
+         sixteen blocks parallel using the AVX instruction set.
+ 
  config CRYPTO_CAST6
        tristate "CAST6 (CAST-256) cipher algorithm"
        select CRYPTO_ALGAPI
@@@ -788,20 -748,29 +837,37 @@@
          The CAST6 encryption algorithm (synonymous with CAST-256) is
          described in RFC2612.
  
+ config CRYPTO_CAST6_AVX_X86_64
+       tristate "CAST6 (CAST-256) cipher algorithm (x86_64/AVX)"
+       depends on X86 && 64BIT
+       select CRYPTO_ALGAPI
+       select CRYPTO_CRYPTD
+       select CRYPTO_ABLK_HELPER_X86
+       select CRYPTO_GLUE_HELPER_X86
+       select CRYPTO_CAST6
+       select CRYPTO_LRW
+       select CRYPTO_XTS
+       help
+         The CAST6 encryption algorithm (synonymous with CAST-256) is
+         described in RFC2612.
+ 
+         This module provides the Cast6 cipher algorithm that processes
+         eight blocks parallel using the AVX instruction set.
+ 
  config CRYPTO_DES
        tristate "DES and Triple DES EDE cipher algorithms"
        select CRYPTO_ALGAPI
        help
          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
  
 +config CRYPTO_DES_SPARC64
 +      tristate "DES and Triple DES EDE cipher algorithms (SPARC64)"
 +      select CRYPTO_ALGAPI
 +      select CRYPTO_DES
 +      help
 +        DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3),
 +        optimized using SPARC64 crypto opcodes.
 +
  config CRYPTO_FCRYPT
        tristate "FCrypt cipher algorithm"
        select CRYPTO_ALGAPI
@@@ -1105,6 -1074,15 +1171,15 @@@ config CRYPTO_LZ
        help
          This is the LZO algorithm.
  
+ config CRYPTO_842
+       tristate "842 compression algorithm"
+       depends on CRYPTO_DEV_NX_COMPRESS
+       # 842 uses lzo if the hardware becomes unavailable
+       select LZO_COMPRESS
+       select LZO_DECOMPRESS
+       help
+         This is the 842 algorithm.
+ 
  comment "Random Number Generation"
  
  config CRYPTO_ANSI_CPRNG

diff --combined crypto/crypto_user.c
index 6bba414d0c619d1fba31c1136aea411a09a930c0,b590471abfa109156e6f711632ead42619cdf22a..35d700a97d79bc926de0b599041e59e7e07c0721
--- 1/crypto/crypto_user.c
--- 2/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@@ -30,7 -30,7 +30,7 @@@
  
  #include "internal.h"
  
- DEFINE_MUTEX(crypto_cfg_mutex);
+ static DEFINE_MUTEX(crypto_cfg_mutex);
  
  /* The crypto netlink socket */
  static struct sock *crypto_nlsk;
@@@ -166,7 -166,7 +166,7 @@@ static int crypto_report_alg(struct cry
        struct crypto_user_alg *ualg;
        int err = 0;
  
 -      nlh = nlmsg_put(skb, NETLINK_CB(in_skb).pid, info->nlmsg_seq,
 +      nlh = nlmsg_put(skb, NETLINK_CB(in_skb).portid, info->nlmsg_seq,
                        CRYPTO_MSG_GETALG, sizeof(*ualg), info->nlmsg_flags);
        if (!nlh) {
                err = -EMSGSIZE;
@@@ -216,7 -216,7 +216,7 @@@ static int crypto_report(struct sk_buf
        if (err)
                return err;
  
 -      return nlmsg_unicast(crypto_nlsk, skb, NETLINK_CB(in_skb).pid);
 +      return nlmsg_unicast(crypto_nlsk, skb, NETLINK_CB(in_skb).portid);
  }
  
  static int crypto_dump_report(struct sk_buff *skb, struct netlink_callback *cb)
@@@ -500,7 -500,8 +500,7 @@@ static int __init crypto_user_init(void
                .input  = crypto_netlink_rcv,
        };
  
 -      crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO,
 -                                          THIS_MODULE, &cfg);
 +      crypto_nlsk = netlink_kernel_create(&init_net, NETLINK_CRYPTO, &cfg);
        if (!crypto_nlsk)
                return -ENOMEM;
  

diff --combined drivers/crypto/caam/key_gen.c
index d216cd3cc569ecdbf195f45b055a5489470f0b70,f5c0d56764cc957446edf18b7ee426855bf3f9d4..f6dba10246c31769b3ae1240bb46c1e6940ebd75
--- 1/drivers/crypto/caam/key_gen.c
--- 2/drivers/crypto/caam/key_gen.c
+++ b/drivers/crypto/caam/key_gen.c
@@@ -54,6 -54,10 +54,10 @@@ u32 gen_split_key(struct device *jrdev
        int ret = 0;
  
        desc = kmalloc(CAAM_CMD_SZ * 6 + CAAM_PTR_SZ * 2, GFP_KERNEL | GFP_DMA);
+       if (!desc) {
+               dev_err(jrdev, "unable to allocate key input memory\n");
+               return -ENOMEM;
+       }
  
        init_job_desc(desc, 0);
  
@@@ -120,4 -124,3 +124,4 @@@
  
        return ret;
  }
 +EXPORT_SYMBOL(gen_split_key);