Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto updates from Herbert Xu:
 "Algorithms:
   - add private key generation to ecdh

  Drivers:
   - add generic gcm(aes) to aesni-intel
   - add SafeXcel EIP197 crypto engine driver
   - add ecb(aes), cfb(aes) and ecb(des3_ede) to cavium
   - add support for CNN55XX adapters in cavium
   - add ctr mode to chcr
   - add support for gcm(aes) to omap"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (140 commits)
  crypto: testmgr - Reenable sha1/aes in FIPS mode
  crypto: ccp - Release locks before returning
  crypto: cavium/nitrox - dma_mapping_error() returns bool
  crypto: doc - fix typo in docs
  Documentation/bindings: Document the SafeXel cryptographic engine driver
  crypto: caam - fix gfp allocation flags (part II)
  crypto: caam - fix gfp allocation flags (part I)
  crypto: drbg - Fixes panic in wait_for_completion call
  crypto: caam - make of_device_ids const.
  crypto: vmx - remove unnecessary check
  crypto: n2 - make of_device_ids const
  crypto: inside-secure - use the base_end pointer in ring rollback
  crypto: inside-secure - increase the batch size
  crypto: inside-secure - only dequeue when needed
  crypto: inside-secure - get the backlog before dequeueing the request
  crypto: inside-secure - stop requeueing failed requests
  crypto: inside-secure - use one queue per hw ring
  crypto: inside-secure - update the context and request later
  crypto: inside-secure - align the cipher and hash send functions
  crypto: inside-secure - optimize DSE bufferability control
  ...

diff --combined MAINTAINERS
index 61d0ac6f535cfdfbd67f20b77006e345a55eda2d,a24eb8c3a227e53dc74ecccdce055ae0ce15bfdd..df62ee151b621739aacea9c0c78828a1e098d12c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -478,7 -478,7 +478,7 @@@ L: linux-hwmon@vger.kernel.or
  S:    Maintained
  F:    Documentation/hwmon/ads1015
  F:    drivers/hwmon/ads1015.c
 -F:    include/linux/i2c/ads1015.h
 +F:    include/linux/platform_data/ads1015.h
  
  ADT746X FAN DRIVER
  M:    Colin Leroy <colin@colino.net>
@@@ -846,6 -846,7 +846,6 @@@ M: Laura Abbott <labbott@redhat.com
  M:    Sumit Semwal <sumit.semwal@linaro.org>
  L:    devel@driverdev.osuosl.org
  S:    Supported
 -F:    Documentation/devicetree/bindings/staging/ion/
  F:    drivers/staging/android/ion
  F:    drivers/staging/android/uapi/ion.h
  F:    drivers/staging/android/uapi/ion_test.h
@@@ -1036,22 -1037,6 +1036,22 @@@ S:    Maintaine
  F:    drivers/amba/
  F:    include/linux/amba/bus.h
  
 +ARM/ACTIONS SEMI ARCHITECTURE
 +M:    Andreas Färber <afaerber@suse.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +N:    owl
 +F:    arch/arm/mach-actions/
 +F:    arch/arm/boot/dts/owl-*
 +F:    arch/arm64/boot/dts/actions/
 +F:    drivers/clocksource/owl-*
 +F:    drivers/soc/actions/
 +F:    include/dt-bindings/power/owl-*
 +F:    include/linux/soc/actions/
 +F:    Documentation/devicetree/bindings/arm/actions.txt
 +F:    Documentation/devicetree/bindings/power/actions,owl-sps.txt
 +F:    Documentation/devicetree/bindings/timer/actions,owl-timer.txt
 +
  ARM/ADS SPHERE MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1188,7 -1173,7 +1188,7 @@@ N:      clps711
  
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
 -M:    Ryan Mallon <rmallon@gmail.com>
 +M:    Alexander Sverdlin <alexander.sverdlin@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ep93xx/
@@@ -1223,9 -1208,7 +1223,9 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    drivers/hwtracing/coresight/*
  F:    Documentation/trace/coresight.txt
 +F:    Documentation/trace/coresight-cpu-debug.txt
  F:    Documentation/devicetree/bindings/arm/coresight.txt
 +F:    Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt
  F:    Documentation/ABI/testing/sysfs-bus-coresight-devices-*
  F:    tools/perf/arch/arm/util/pmu.c
  F:    tools/perf/arch/arm/util/auxtrace.c
@@@ -1507,15 -1490,13 +1507,15 @@@ M:   Gregory Clement <gregory.clement@fre
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/mach-mvebu/
 -F:    drivers/rtc/rtc-armada38x.c
  F:    arch/arm/boot/dts/armada*
  F:    arch/arm/boot/dts/kirkwood*
 +F:    arch/arm/configs/mvebu_*_defconfig
 +F:    arch/arm/mach-mvebu/
  F:    arch/arm64/boot/dts/marvell/armada*
  F:    drivers/cpufreq/mvebu-cpufreq.c
 -F:    arch/arm/configs/mvebu_*_defconfig
 +F:    drivers/irqchip/irq-armada-370-xp.c
 +F:    drivers/irqchip/irq-mvebu-*
 +F:    drivers/rtc/rtc-armada38x.c
  
  ARM/Marvell Berlin SoC support
  M:    Jisheng Zhang <jszhang@marvell.com>
@@@ -1697,13 -1678,6 +1697,13 @@@ M:    Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/REALTEK ARCHITECTURE
 +M:    Andreas Färber <afaerber@suse.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/boot/dts/realtek/
 +F:    Documentation/devicetree/bindings/arm/realtek.txt
 +
  ARM/RENESAS ARM64 ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
@@@ -1737,7 -1711,6 +1737,7 @@@ L:      linux-rockchip@lists.infradead.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
  F:    arch/arm/boot/dts/rk3*
 +F:    arch/arm/boot/dts/rv1108*
  F:    arch/arm/mach-rockchip/
  F:    drivers/clk/rockchip/
  F:    drivers/i2c/busses/i2c-rk3x.c
@@@ -1749,6 -1722,7 +1749,6 @@@ N:      rockchi
  ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
  M:    Kukjin Kim <kgene@kernel.org>
  M:    Krzysztof Kozlowski <krzk@kernel.org>
 -R:    Javier Martinez Canillas <javier@osg.samsung.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
@@@ -1856,6 -1830,7 +1856,6 @@@ F:      drivers/edac/altera_edac
  ARM/STI ARCHITECTURE
  M:    Patrice Chotard <patrice.chotard@st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -L:    kernel@stlinux.com
  W:    http://www.stlinux.com
  S:    Maintained
  F:    arch/arm/mach-sti/
@@@ -1869,8 -1844,8 +1869,8 @@@ F:      drivers/i2c/busses/i2c-st.
  F:    drivers/media/rc/st_rc.c
  F:    drivers/media/platform/sti/c8sectpfe/
  F:    drivers/mmc/host/sdhci-st.c
 -F:    drivers/phy/phy-miphy28lp.c
 -F:    drivers/phy/phy-stih407-usb.c
 +F:    drivers/phy/st/phy-miphy28lp.c
 +F:    drivers/phy/st/phy-stih407-usb.c
  F:    drivers/pinctrl/pinctrl-st.c
  F:    drivers/remoteproc/st_remoteproc.c
  F:    drivers/remoteproc/st_slim_rproc.c
@@@ -2348,15 -2323,6 +2348,15 @@@ F:    Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/atmel_mxt_ts.c
  F:    include/linux/platform_data/atmel_mxt_ts.h
  
 +ATOMIC INFRASTRUCTURE
 +M:    Will Deacon <will.deacon@arm.com>
 +M:    Peter Zijlstra <peterz@infradead.org>
 +R:    Boqun Feng <boqun.feng@gmail.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    arch/*/include/asm/atomic*.h
 +F:    include/*/atomic*.h
 +
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
  M:    Bradley Grove <linuxdrivers@attotech.com>
  L:    linux-scsi@vger.kernel.org
@@@ -2720,6 -2686,7 +2720,6 @@@ N:      kon
  F:    arch/arm/mach-bcm/
  
  BROADCOM BCM2835 ARM ARCHITECTURE
 -M:    Lee Jones <lee@kernel.org>
  M:    Eric Anholt <eric@anholt.net>
  M:    Stefan Wahren <stefan.wahren@i2se.com>
  L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -2998,7 -2965,7 +2998,7 @@@ F:      sound/pci/oxygen
  
  C6X ARCHITECTURE
  M:    Mark Salter <msalter@redhat.com>
 -M:    Aurelien Jacquiot <a-jacquiot@ti.com>
 +M:    Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
  L:    linux-c6x-dev@linux-c6x.org
  W:    http://www.linux-c6x.org/wiki/index.php/Main_Page
  S:    Maintained
@@@ -3149,14 -3116,6 +3149,14 @@@ F:    drivers/net/ieee802154/cc2520.
  F:    include/linux/spi/cc2520.h
  F:    Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  
 +CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER
 +M:    Gilad Ben-Yossef <gilad@benyossef.com>
 +L:    linux-crypto@vger.kernel.org
 +L:    driverdev-devel@linuxdriverproject.org
 +S:    Supported
 +F:    drivers/staging/ccree/
 +W:    https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family
 +
  CEC FRAMEWORK
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -3620,6 -3579,7 +3620,6 @@@ T:      git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/crypto/
  F:    Documentation/devicetree/bindings/crypto/
 -F:    Documentation/DocBook/crypto-API.tmpl
  F:    arch/*/crypto/
  F:    crypto/
  F:    drivers/crypto/
@@@ -3746,6 -3706,13 +3746,13 @@@ S:    Supporte
  F:    drivers/infiniband/hw/cxgb4/
  F:    include/uapi/rdma/cxgb4-abi.h
  
+ CXGB4 CRYPTO DRIVER (chcr)
+ M:    Harsh Jain <harsh@chelsio.com>
+ L:    linux-crypto@vger.kernel.org
+ W:    http://www.chelsio.com
+ S:    Supported
+ F:    drivers/crypto/chelsio
+ 
  CXGB4VF ETHERNET DRIVER (CXGB4VF)
  M:    Casey Leedom <leedom@chelsio.com>
  L:    netdev@vger.kernel.org
@@@ -4176,7 -4143,8 +4183,7 @@@ M:      Jonathan Corbet <corbet@lwn.net
  L:    linux-doc@vger.kernel.org
  S:    Maintained
  F:    Documentation/
 -F:    scripts/docproc.c
 -F:    scripts/kernel-doc*
 +F:    scripts/kernel-doc
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/acpi
@@@ -5654,7 -5622,7 +5661,7 @@@ F:      scripts/get_maintainer.p
  
  GENWQE (IBM Generic Workqueue Card)
  M:    Frank Haverkamp <haver@linux.vnet.ibm.com>
 -M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
 +M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
  S:    Supported
  F:    drivers/misc/genwqe/
  
@@@ -5699,6 -5667,7 +5706,6 @@@ F:      tools/testing/selftests/gpio
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
 -M:    Alexandre Courbot <gnurou@gmail.com>
  L:    linux-gpio@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
  S:    Maintained
@@@ -5733,7 -5702,7 +5740,7 @@@ M:      Alex Elder <elder@kernel.org
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
  F:    drivers/staging/greybus/
 -L:    greybus-dev@lists.linaro.org
 +L:    greybus-dev@lists.linaro.org (moderated for non-subscribers)
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <vaibhav.sr@gmail.com>
@@@ -6512,13 -6481,6 +6519,13 @@@ F:    Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/devicetree/bindings/iio/adc/envelope-detector.txt
  F:    drivers/iio/adc/envelope-detector.c
  
 +IIO MULTIPLEXER
 +M:    Peter Rosin <peda@axentia.se>
 +L:    linux-iio@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/iio/multiplexer/iio-mux.txt
 +F:    drivers/iio/multiplexer/iio-mux.c
 +
  IIO SUBSYSTEM AND DRIVERS
  M:    Jonathan Cameron <jic23@kernel.org>
  R:    Hartmut Knaack <knaack.h@gmx.de>
@@@ -6647,6 -6609,12 +6654,12 @@@ F:    Documentation/input/multi-touch-prot
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
+ INSIDE SECURE CRYPTO DRIVER
+ M:    Antoine Tenart <antoine.tenart@free-electrons.com>
+ F:    drivers/crypto/inside-secure/
+ S:    Maintained
+ L:    linux-crypto@vger.kernel.org
+ 
  INTEL ASoC BDW/HSW DRIVERS
  M:    Jie Yang <yang.jie@linux.intel.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -7181,7 -7149,7 +7194,7 @@@ S:      Maintaine
  F:    drivers/media/platform/rcar_jpu.c
  
  JSM Neo PCI based serial card
 -M:    Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
 +M:    Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
  F:    drivers/tty/serial/jsm/
@@@ -7387,7 -7355,7 +7400,7 @@@ KEYS/KEYRINGS
  M:    David Howells <dhowells@redhat.com>
  L:    keyrings@vger.kernel.org
  S:    Maintained
 -F:    Documentation/security/keys.txt
 +F:    Documentation/security/keys/core.rst
  F:    include/linux/key.h
  F:    include/linux/key-type.h
  F:    include/linux/keyctl.h
@@@ -7401,7 -7369,7 +7414,7 @@@ M:      Mimi Zohar <zohar@linux.vnet.ibm.com
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@vger.kernel.org
  S:    Supported
 -F:    Documentation/security/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/trusted-type.h
  F:    security/keys/trusted.c
  F:    security/keys/trusted.h
@@@ -7412,7 -7380,7 +7425,7 @@@ M:      David Safford <safford@us.ibm.com
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@vger.kernel.org
  S:    Supported
 -F:    Documentation/security/keys-trusted-encrypted.txt
 +F:    Documentation/security/keys/trusted-encrypted.rst
  F:    include/keys/encrypted-type.h
  F:    security/keys/encrypted-keys/
  
@@@ -7422,7 -7390,7 +7435,7 @@@ W:      http://kgdb.wiki.kernel.org
  L:    kgdb-bugreport@lists.sourceforge.net
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
  S:    Maintained
 -F:    Documentation/DocBook/kgdb.tmpl
 +F:    Documentation/dev-tools/kgdb.rst
  F:    drivers/misc/kgdbts.c
  F:    drivers/tty/serial/kgdboc.c
  F:    include/linux/kdb.h
@@@ -7594,7 -7562,7 +7607,7 @@@ S:      Maintaine
  F:    drivers/ata/sata_promise.*
  
  LIBLOCKDEP
 -M:    Sasha Levin <sasha.levin@oracle.com>
 +M:    Sasha Levin <alexander.levin@verizon.com>
  S:    Maintained
  F:    tools/lib/lockdep/
  
@@@ -7745,7 -7713,7 +7758,7 @@@ F:      drivers/platform/x86/hp_accel.
  
  LIVE PATCHING
  M:    Josh Poimboeuf <jpoimboe@redhat.com>
 -M:    Jessica Yu <jeyu@redhat.com>
 +M:    Jessica Yu <jeyu@kernel.org>
  M:    Jiri Kosina <jikos@kernel.org>
  M:    Miroslav Benes <mbenes@suse.cz>
  R:    Petr Mladek <pmladek@suse.com>
@@@ -8099,11 -8067,11 +8112,11 @@@ S:   Supporte
  F:    drivers/power/supply/max14577_charger.c
  F:    drivers/power/supply/max77693_charger.c
  
 -MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 -M:    Javier Martinez Canillas <javier@osg.samsung.com>
 +MAXIM MAX77802 PMIC REGULATOR DEVICE DRIVER
 +M:    Javier Martinez Canillas <javier@dowhile0.org>
  L:    linux-kernel@vger.kernel.org
  S:    Supported
 -F:    drivers/*/*max77802*.c
 +F:    drivers/regulator/max77802-regulator.c
  F:    Documentation/devicetree/bindings/*/*max77802.txt
  F:    include/dt-bindings/*/*max77802.h
  
@@@ -8306,6 -8274,11 +8319,11 @@@ L:    linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/mediatek/mt7601u/
  
+ MEDIATEK RANDOM NUMBER GENERATOR SUPPORT
+ M:      Sean Wang <sean.wang@mediatek.com>
+ S:      Maintained
+ F:      drivers/char/hw_random/mtk-rng.c
+ 
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <peter.senna@collabora.com>
  M:    Martin Donnelly <martin.donnelly@ge.com>
@@@ -8476,7 -8449,7 +8494,7 @@@ T:      git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 -MICROCHIP / ATMEL AT91 / AT32 SERIAL DRIVER
 +MICROCHIP / ATMEL AT91 SERIAL DRIVER
  M:    Richard Genoud <richard.genoud@gmail.com>
  S:    Maintained
  F:    drivers/tty/serial/atmel_serial.c
@@@ -8546,7 -8519,7 +8564,7 @@@ S:      Odd Fixe
  F:    drivers/media/radio/radio-miropcm20*
  
  MELLANOX MLX4 core VPI driver
 -M:    Yishai Hadas <yishaih@mellanox.com>
 +M:    Tariq Toukan <tariqt@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
@@@ -8554,6 -8527,7 +8572,6 @@@ Q:      http://patchwork.ozlabs.org/project/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx4/
  F:    include/linux/mlx4/
 -F:    include/uapi/rdma/mlx4-abi.h
  
  MELLANOX MLX4 IB driver
  M:    Yishai Hadas <yishaih@mellanox.com>
@@@ -8563,7 -8537,6 +8581,7 @@@ Q:      http://patchwork.kernel.org/project/
  S:    Supported
  F:    drivers/infiniband/hw/mlx4/
  F:    include/linux/mlx4/
 +F:    include/uapi/rdma/mlx4-abi.h
  
  MELLANOX MLX5 core VPI driver
  M:    Saeed Mahameed <saeedm@mellanox.com>
@@@ -8576,6 -8549,7 +8594,6 @@@ Q:      http://patchwork.ozlabs.org/project/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
 -F:    include/uapi/rdma/mlx5-abi.h
  
  MELLANOX MLX5 IB driver
  M:    Matan Barak <matanb@mellanox.com>
@@@ -8586,7 -8560,6 +8604,7 @@@ Q:      http://patchwork.kernel.org/project/
  S:    Supported
  F:    drivers/infiniband/hw/mlx5/
  F:    include/linux/mlx5/
 +F:    include/uapi/rdma/mlx5-abi.h
  
  MELEXIS MLX90614 DRIVER
  M:    Crt Mori <cmo@melexis.com>
@@@ -8626,7 -8599,7 +8644,7 @@@ S:      Maintaine
  F:    drivers/media/dvb-frontends/mn88473*
  
  MODULE SUPPORT
 -M:    Jessica Yu <jeyu@redhat.com>
 +M:    Jessica Yu <jeyu@kernel.org>
  M:    Rusty Russell <rusty@rustcorp.com.au>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git modules-next
  S:    Maintained
@@@ -8754,15 -8727,6 +8772,15 @@@ S:    Orpha
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
  
 +MULTIPLEXER SUBSYSTEM
 +M:    Peter Rosin <peda@axentia.se>
 +S:    Maintained
 +F:    Documentation/ABI/testing/mux/sysfs-class-mux*
 +F:    Documentation/devicetree/bindings/mux/
 +F:    include/linux/dt-bindings/mux/
 +F:    include/linux/mux/
 +F:    drivers/mux/
 +
  MULTISOUND SOUND DRIVER
  M:    Andrew Veliath <andrewtv@usa.net>
  S:    Maintained
@@@ -9607,6 -9571,10 +9625,6 @@@ F:     drivers/net/wireless/intersil/orinoc
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <ooo@electrozaur.com>
 -M:    Benny Halevy <bhalevy@primarydata.com>
 -L:    osd-dev@open-osd.org
 -W:    http://open-osd.org
 -T:    git git://git.open-osd.org/open-osd.git
  S:    Maintained
  F:    drivers/scsi/osd/
  F:    include/scsi/osd_*
@@@ -10202,7 -10170,7 +10220,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    Documentation/hwmon/pmbus
  F:    drivers/hwmon/pmbus/
 -F:    include/linux/i2c/pmbus.h
 +F:    include/linux/pmbus.h
  
  PMC SIERRA MaxRAID DRIVER
  L:    linux-scsi@vger.kernel.org
@@@ -10497,7 -10465,7 +10515,7 @@@ S:   Orpha
  
  PXA RTC DRIVER
  M:    Robert Jarzmik <robert.jarzmik@free.fr>
 -L:    rtc-linux@googlegroups.com
 +L:    linux-rtc@vger.kernel.org
  S:    Maintained
  
  QAT DRIVER
@@@ -10592,7 -10560,6 +10610,7 @@@ M:   Laurentiu Tudor <laurentiu.tudor@nxp
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/staging/fsl-mc/
 +F:    Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
  
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
@@@ -10805,7 -10772,7 +10823,7 @@@ X:   kernel/torture.
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  M:    Alexandre Belloni <alexandre.belloni@free-electrons.com>
 -L:    rtc-linux@googlegroups.com
 +L:    linux-rtc@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git
  S:    Maintained
@@@ -10880,11 -10847,11 +10898,11 @@@ L:        linux-iio@vger.kernel.or
  S:    Supported
  F:    drivers/iio/adc/rcar_gyro_adc.c
  
 -RENESAS USB2 PHY DRIVER
 +RENESAS USB PHY DRIVER
  M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
  L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
 -F:    drivers/phy/phy-rcar-gen3-usb2.c
 +F:    drivers/phy/renesas/phy-rcar-gen3-usb*.c
  
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
@@@ -11041,7 -11008,7 +11059,7 @@@ S:   Supporte
  F:    arch/s390/
  F:    drivers/s390/
  F:    Documentation/s390/
 -F:    Documentation/DocBook/s390*
 +F:    Documentation/driver-api/s390-drivers.rst
  
  S390 COMMON I/O LAYER
  M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
@@@ -11286,12 -11253,12 +11304,12 @@@ L:        linux-kernel@vger.kernel.or
  S:    Supported
  F:    Documentation/devicetree/bindings/phy/samsung-phy.txt
  F:    Documentation/phy/samsung-usb2.txt
 -F:    drivers/phy/phy-exynos4210-usb2.c
 -F:    drivers/phy/phy-exynos4x12-usb2.c
 -F:    drivers/phy/phy-exynos5250-usb2.c
 -F:    drivers/phy/phy-s5pv210-usb2.c
 -F:    drivers/phy/phy-samsung-usb2.c
 -F:    drivers/phy/phy-samsung-usb2.h
 +F:    drivers/phy/samsung/phy-exynos4210-usb2.c
 +F:    drivers/phy/samsung/phy-exynos4x12-usb2.c
 +F:    drivers/phy/samsung/phy-exynos5250-usb2.c
 +F:    drivers/phy/samsung/phy-s5pv210-usb2.c
 +F:    drivers/phy/samsung/phy-samsung-usb2.c
 +F:    drivers/phy/samsung/phy-samsung-usb2.h
  
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
@@@ -11316,6 -11283,7 +11334,6 @@@ F:   drivers/media/rc/serial_ir.
  
  STI CEC DRIVER
  M:    Benjamin Gaignard <benjamin.gaignard@linaro.org>
 -L:    kernel@stlinux.com
  S:    Maintained
  F:    drivers/staging/media/st-cec/
  F:    Documentation/devicetree/bindings/media/stih-cec.txt
@@@ -11375,9 -11343,6 +11393,9 @@@ F:   Documentation/tee.tx
  
  THUNDERBOLT DRIVER
  M:    Andreas Noever <andreas.noever@gmail.com>
 +M:    Michael Jamet <michael.jamet@intel.com>
 +M:    Mika Westerberg <mika.westerberg@linux.intel.com>
 +M:    Yehezkel Bernat <yehezkel.bernat@intel.com>
  S:    Maintained
  F:    drivers/thunderbolt/
  
@@@ -11545,7 -11510,6 +11563,7 @@@ F:   kernel/seccomp.
  F:    include/uapi/linux/seccomp.h
  F:    include/linux/seccomp.h
  F:    tools/testing/selftests/seccomp/*
 +F:    Documentation/userspace-api/seccomp_filter.rst
  K:    \bsecure_computing
  K:    \bTIF_SECCOMP\b
  
@@@ -11604,7 -11568,6 +11622,7 @@@ S:   Supporte
  F:    include/linux/selinux*
  F:    security/selinux/
  F:    scripts/selinux/
 +F:    Documentation/admin-guide/LSM/SELinux.rst
  
  APPARMOR SECURITY MODULE
  M:    John Johansen <john.johansen@canonical.com>
@@@ -11613,21 -11576,18 +11631,21 @@@ W:        apparmor.wiki.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev.git
  S:    Supported
  F:    security/apparmor/
 +F:    Documentation/admin-guide/LSM/apparmor.rst
  
  LOADPIN SECURITY MODULE
  M:    Kees Cook <keescook@chromium.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git lsm/loadpin
  S:    Supported
  F:    security/loadpin/
 +F:    Documentation/admin-guide/LSM/LoadPin.rst
  
  YAMA SECURITY MODULE
  M:    Kees Cook <keescook@chromium.org>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git yama/tip
  S:    Supported
  F:    security/yama/
 +F:    Documentation/admin-guide/LSM/Yama.rst
  
  SENSABLE PHANTOM
  M:    Jiri Slaby <jirislaby@gmail.com>
@@@ -11833,7 -11793,6 +11851,7 @@@ T:   git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    arch/arm/mach-davinci/
  F:    drivers/i2c/busses/i2c-davinci.c
 +F:    arch/arm/boot/dts/da850*
  
  TI DAVINCI SERIES MEDIA DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
@@@ -11930,7 -11889,7 +11948,7 @@@ L:   linux-security-module@vger.kernel.or
  W:    http://schaufler-ca.com
  T:    git git://github.com/cschaufler/smack-next
  S:    Maintained
 -F:    Documentation/security/Smack.txt
 +F:    Documentation/admin-guide/LSM/Smack.rst
  F:    security/smack/
  
  DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
@@@ -12689,8 -12648,6 +12707,8 @@@ F:   include/linux/soc/ti/ti_sci_protocol
  F:    Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt
  F:    include/dt-bindings/genpd/k2g.h
  F:    drivers/soc/ti/ti_sci_pm_domains.c
 +F:    Documentation/devicetree/bindings/reset/ti,sci-reset.txt
 +F:    drivers/reset/reset-ti-sci.c
  
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -12940,7 -12897,7 +12958,7 @@@ M:   Wolfram Sang <wsa+renesas@sang-engin
  L:    linux-mmc@vger.kernel.org
  S:    Supported
  F:    drivers/mmc/host/tmio_mmc*
 -F:    drivers/mmc/host/sh_mobile_sdhi.c
 +F:    drivers/mmc/host/renesas_sdhi*
  F:    include/linux/mfd/tmio.h
  
  TMP401 HARDWARE MONITOR DRIVER
@@@ -13521,17 -13478,6 +13539,17 @@@ W: http://en.wikipedia.org/wiki/Util-li
  T:    git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
  S:    Maintained
  
 +UUID HELPERS
 +M:    Christoph Hellwig <hch@lst.de>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 +L:    linux-kernel@vger.kernel.org
 +T:    git git://git.infradead.org/users/hch/uuid.git
 +F:    lib/uuid.c
 +F:    lib/test_uuid.c
 +F:    include/linux/uuid.h
 +F:    include/uapi/linux/uuid.h
 +S:    Maintained
 +
  UVESAFB DRIVER
  M:    Michal Januszewski <spock@gentoo.org>
  L:    linux-fbdev@vger.kernel.org
@@@ -13838,7 -13784,6 +13856,7 @@@ M:   Evgeniy Polyakov <zbr@ioremap.net
  S:    Maintained
  F:    Documentation/w1/
  F:    drivers/w1/
 +F:    include/linux/w1.h
  
  W83791D HARDWARE MONITORING DRIVER
  M:    Marc Hulsman <m.hulsman@tudelft.nl>
@@@ -13931,7 -13876,7 +13949,7 @@@ S:   Odd fixe
  F:    drivers/net/wireless/wl3501*
  
  WOLFSON MICROELECTRONICS DRIVERS
 -L:    patches@opensource.wolfsonmicro.com
 +L:    patches@opensource.cirrus.com
  T:    git https://github.com/CirrusLogic/linux-drivers.git
  W:    https://github.com/CirrusLogic/linux-drivers/wiki
  S:    Supported

diff --combined drivers/crypto/Kconfig
index 9c7951bb05ac77da340de3ee5353e5f2681c4cae,0528a62a39a68660bf1d3e6a5ceb111d200d8f28..193204dfbf3a084f7540621fd377b98f2cb7e01a
--- 1/drivers/crypto/Kconfig
--- 2/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@@ -89,20 -89,6 +89,20 @@@ config PKE
          requires to have at least one CEX card in coprocessor mode
          available at runtime.
  
 +config CRYPTO_PAES_S390
 +      tristate "PAES cipher algorithms"
 +      depends on S390
 +      depends on ZCRYPT
 +      depends on PKEY
 +      select CRYPTO_ALGAPI
 +      select CRYPTO_BLKCIPHER
 +      help
 +        This is the s390 hardware accelerated implementation of the
 +        AES cipher algorithms for use with protected key.
 +
 +        Select this option if you want to use the paes cipher
 +        for example to use protected key encrypted devices.
 +
  config CRYPTO_SHA1_S390
        tristate "SHA1 digest algorithm"
        depends on S390
@@@ -151,6 -137,7 +151,6 @@@ config CRYPTO_AES_S39
        depends on S390
        select CRYPTO_ALGAPI
        select CRYPTO_BLKCIPHER
 -      select PKEY
        help
          This is the s390 hardware accelerated implementation of the
          AES cipher algorithms (FIPS-197).
@@@ -327,6 -314,15 +327,15 @@@ config HW_RANDOM_PPC4X
         This option provides the kernel-side support for the TRNG hardware
         found in the security function of some PowerPC 4xx SoCs.
  
+ config CRYPTO_DEV_OMAP
+       tristate "Support for OMAP crypto HW accelerators"
+       depends on ARCH_OMAP2PLUS
+       help
+         OMAP processors have various crypto HW accelerators. Select this if
+           you want to use the OMAP modules for any of the crypto algorithms.
+ 
+ if CRYPTO_DEV_OMAP
+ 
  config CRYPTO_DEV_OMAP_SHAM
        tristate "Support for OMAP MD5/SHA1/SHA2 hw accelerator"
        depends on ARCH_OMAP2PLUS
@@@ -348,6 -344,7 +357,7 @@@ config CRYPTO_DEV_OMAP_AE
        select CRYPTO_CBC
        select CRYPTO_ECB
        select CRYPTO_CTR
+       select CRYPTO_AEAD
        help
          OMAP processors have AES module accelerator. Select this if you
          want to use the OMAP module for AES algorithms.
@@@ -364,6 -361,8 +374,8 @@@ config CRYPTO_DEV_OMAP_DE
          the ECB and CBC modes of operation are supported by the driver. Also
          accesses made on unaligned boundaries are supported.
  
+ endif # CRYPTO_DEV_OMAP
+ 
  config CRYPTO_DEV_PICOXCELL
        tristate "Support for picoXcell IPSEC and Layer2 crypto engines"
        depends on (ARCH_PICOXCELL || COMPILE_TEST) && HAVE_CLK
@@@ -542,6 -541,7 +554,7 @@@ config CRYPTO_DEV_MXS_DC
  
  source "drivers/crypto/qat/Kconfig"
  source "drivers/crypto/cavium/cpt/Kconfig"
+ source "drivers/crypto/cavium/nitrox/Kconfig"
  
  config CRYPTO_DEV_CAVIUM_ZIP
        tristate "Cavium ZIP driver"
@@@ -656,4 -656,21 +669,21 @@@ config CRYPTO_DEV_BCM_SP
  
  source "drivers/crypto/stm32/Kconfig"
  
+ config CRYPTO_DEV_SAFEXCEL
+       tristate "Inside Secure's SafeXcel cryptographic engine driver"
+       depends on HAS_DMA && OF
+       depends on (ARM64 && ARCH_MVEBU) || (COMPILE_TEST && 64BIT)
+       select CRYPTO_AES
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_HASH
+       select CRYPTO_HMAC
+       select CRYPTO_SHA1
+       select CRYPTO_SHA256
+       select CRYPTO_SHA512
+       help
+         This driver interfaces with the SafeXcel EIP-197 cryptographic engine
+         designed by Inside Secure. Select this if you want to use CBC/ECB
+         chain mode, AES cipher mode and SHA1/SHA224/SHA256/SHA512 hash
+         algorithms.
+ 
  endif # CRYPTO_HW