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.20:

   - Added 192/256-bit key support to aesni GCM.
   - Added MIPS OCTEON MD5 support.
   - Fixed hwrng starvation and race conditions.
   - Added note that memzero_explicit is not a subsitute for memset.
   - Added user-space interface for crypto_rng.
   - Misc fixes"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits)
  crypto: tcrypt - do not allocate iv on stack for aead speed tests
  crypto: testmgr - limit IV copy length in aead tests
  crypto: tcrypt - fix buflen reminder calculation
  crypto: testmgr - mark rfc4106(gcm(aes)) as fips_allowed
  crypto: caam - fix resource clean-up on error path for caam_jr_init
  crypto: caam - pair irq map and dispose in the same function
  crypto: ccp - terminate ccp_support array with empty element
  crypto: caam - remove unused local variable
  crypto: caam - remove dead code
  crypto: caam - don't emit ICV check failures to dmesg
  hwrng: virtio - drop extra empty line
  crypto: replace scatterwalk_sg_next with sg_next
  crypto: atmel - Free memory in error path
  crypto: doc - remove colons in comments
  crypto: seqiv - Ensure that IV size is at least 8 bytes
  crypto: cts - Weed out non-CBC algorithms
  MAINTAINERS: add linux-crypto to hw random
  crypto: cts - Remove bogus use of seqiv
  crypto: qat - don't need qat_auth_state struct
  crypto: algif_rng - fix sparse non static symbol warning
  ...

diff --combined MAINTAINERS
index cd8383e26ac8fad7648a9f79019314fbb5af291e,aa5aaebf0397205455f6243c05595b4a36d6ff9d..3ac697a64280024b6913011c1627fe1ae4056dcc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -270,12 -270,12 +270,12 @@@ F:      drivers/acpi
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
  F:    include/acpi/
 -F:    Documentation/acpi
 +F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
  F:    drivers/pci/*acpi*
  F:    drivers/pci/*/*acpi*
  F:    drivers/pci/*/*/*acpi*
 -F:    tools/power/acpi
 +F:    tools/power/acpi/
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <[email protected]>
@@@ -563,12 -563,6 +563,12 @@@ S:       Odd Fixe
  L:    [email protected]
  F:    arch/alpha/
  
 +ALTERA MAILBOX DRIVER
 +M:    Ley Foon Tan <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/mailbox/mailbox-altera.c
 +
  ALTERA TRIPLE SPEED ETHERNET DRIVER
  M:    Vince Bridgers <[email protected]>
  L:    [email protected]
@@@ -665,13 -659,6 +665,13 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7180 DRIVER
 +M:    Lars-Peter Clausen <[email protected]>
 +L:    [email protected]
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/media/i2c/adv7180.c
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -709,7 -696,7 +709,7 @@@ L: [email protected] (moderat
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    sound/soc/blackfin/*
 - 
 +
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  M:    Michael Hennerich <[email protected]>
@@@ -721,16 -708,6 +721,16 @@@ X:       drivers/iio/*/adjd
  F:    drivers/staging/iio/*/ad*
  F:    staging/iio/trigger/iio-trig-bfin-timer.c
  
 +ANDROID DRIVERS
 +M:    Greg Kroah-Hartman <[email protected]>
 +M:    Arve Hjønnevåg <[email protected]>
 +M:    Riley Andrews <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/android/
 +F:    drivers/staging/android/
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <[email protected]>
  L:    [email protected]
@@@ -747,15 -724,15 +747,15 @@@ F:      include/uapi/linux/apm_bios.
  F:    drivers/char/apm-emulation.c
  
  APPLE BCM5974 MULTITOUCH DRIVER
 -M:    Henrik Rydberg <rydberg@euromail.se>
 +M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd fixes
  F:    drivers/input/mouse/bcm5974.c
  
  APPLE SMC DRIVER
 -M:    Henrik Rydberg <rydberg@euromail.se>
 +M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    [email protected]
 -S:    Maintained
 +S:    Odd fixes
  F:    drivers/hwmon/applesmc.c
  
  APPLETALK NETWORK LAYER
@@@ -777,6 -754,13 +777,6 @@@ L:        [email protected]
  S:    Maintained
  F:    drivers/media/i2c/aptina-pll.*
  
 -ARASAN COMPACT FLASH PATA CONTROLLER
 -M:    Viresh Kumar <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/pata_arasan_cf_data.h
 -F:    drivers/ata/pata_arasan_cf.c
 -
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -1173,7 -1157,6 +1173,7 @@@ M:      Sebastian Hesselbarth <sebastian.hes
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-mvebu/
 +F:    drivers/rtc/armada38x-rtc
  
  ARM/Marvell Berlin SoC support
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -1600,14 -1583,12 +1600,14 @@@ N:   xilin
  F:    drivers/clocksource/cadence_ttc_timer.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
 +F:    drivers/edac/synopsys_edac.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
 +F:    drivers/iommu/io-pgtable-arm.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <[email protected]>
@@@ -1676,6 -1657,7 +1676,6 @@@ M:      Jiri Slaby <[email protected]
  M:    Nick Kossifidis <[email protected]>
  M:    "Luis R. Rodriguez" <[email protected]>
  L:    [email protected]
 -L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/ath5k
  S:    Maintained
  F:    drivers/net/wireless/ath/ath5k/
@@@ -2277,7 -2259,6 +2277,7 @@@ F:      drivers/gpio/gpio-bt8xx.
  BTRFS FILE SYSTEM
  M:    Chris Mason <[email protected]>
  M:    Josef Bacik <[email protected]>
 +M:    David Sterba <[email protected]>
  L:    [email protected]
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
@@@ -2364,8 -2345,7 +2364,8 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <[email protected]>
  L:    [email protected]
  W:    http://gitorious.org/linux-can
 -T:    git git://gitorious.org/linux-can/linux-can-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
  F:    Documentation/networking/can.txt
  F:    net/can/
@@@ -2380,8 -2360,7 +2380,8 @@@ M:      Wolfgang Grandegger <[email protected]
  M:    Marc Kleine-Budde <[email protected]>
  L:    [email protected]
  W:    http://gitorious.org/linux-can
 -T:    git git://gitorious.org/linux-can/linux-can-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
  F:    drivers/net/can/
  F:    include/linux/can/dev.h
@@@ -3203,7 -3182,7 +3203,7 @@@ L:      [email protected]
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Maintained
  F:    drivers/dma/
 -F:    include/linux/dma*
 +F:    include/linux/dmaengine.h
  F:    Documentation/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
@@@ -3228,7 -3207,6 +3228,7 @@@ F:      Documentation
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
 +T:    git git://git.lwn.net/linux-2.6.git docs-next
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <[email protected]>
@@@ -3488,14 -3466,6 +3488,14 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
 +E3X0 POWER BUTTON DRIVER
 +M:    Moritz Fischer <[email protected]>
 +L:    [email protected]
 +W:    http://www.ettus.com
 +S:    Supported
 +F:    drivers/input/misc/e3x0-button.c
 +F:    Documentation/devicetree/bindings/input/e3x0-button.txt
 +
  E4000 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
@@@ -3537,8 -3507,6 +3537,8 @@@ M:      Borislav Petkov <[email protected]
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
 +T:    git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
  S:    Supported
  F:    Documentation/edac.txt
  F:    drivers/edac/
@@@ -4434,6 -4402,7 +4434,7 @@@ F:      include/linux/hwmon*.
  HARDWARE RANDOM NUMBER GENERATOR CORE
  M:    Matt Mackall <[email protected]>
  M:    Herbert Xu <[email protected]>
+ L:    [email protected]
  S:    Odd fixes
  F:    Documentation/hw_random.txt
  F:    drivers/char/hw_random/
@@@ -4780,20 -4749,20 +4781,20 @@@ S:   Supporte
  F:    drivers/scsi/ipr.*
  
  IBM Power Virtual Ethernet Device Driver
 -M:    Santiago Leon <santil@linux.vnet.ibm.com>
 +M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
  IBM Power Virtual SCSI Device Drivers
 -M:    Nathan Fontenot <nfont@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvscsi*
  F:    drivers/scsi/ibmvscsi/viosrp.h
  
  IBM Power Virtual FC Device Drivers
 -M:    Brian King <brking@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
@@@ -4919,7 -4888,7 +4920,7 @@@ F:      drivers/ipack
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <[email protected]>
 -M:    Dmitry Kasatkin <d.kasatkin@samsung.com>
 +M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
@@@ -4961,6 -4930,7 +4962,6 @@@ F:      include/uapi/linux/inotify.
  
  INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
  M:    Dmitry Torokhov <[email protected]>
 -M:    Dmitry Torokhov <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
@@@ -4971,27 -4941,18 +4972,27 @@@ F:   include/uapi/linux/input.
  F:    include/linux/input/
  
  INPUT MULTITOUCH (MT) PROTOCOL
 -M:    Henrik Rydberg <rydberg@euromail.se>
 +M:    Henrik Rydberg <rydberg@bitmath.org>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git
 -S:    Maintained
 +S:    Odd fixes
  F:    Documentation/input/multi-touch-protocol.txt
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
 +INTEL ASoC BDW/HSW DRIVERS
 +M:    Jie Yang <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    sound/soc/intel/sst-haswell*
 +F:    sound/soc/intel/sst-dsp*
 +F:    sound/soc/intel/sst-firmware.c
 +F:    sound/soc/intel/broadwell.c
 +F:    sound/soc/intel/haswell.c
 +
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <[email protected]>
  M:    Artur Paszkiewicz <[email protected]>
 -M:    Dave Jiang <[email protected]>
  L:    [email protected]
  T:    git git://git.code.sf.net/p/intel-sas/isci
  S:    Supported
@@@ -5319,15 -5280,6 +5320,15 @@@ W:    www.open-iscsi.or
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/ulp/iser/
  
 +ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
 +M:    Sagi Grimberg <[email protected]>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +W:    http://www.linux-iscsi.org
 +F:    drivers/infiniband/ulp/isert
 +
  ISDN SUBSYSTEM
  M:    Karsten Keil <[email protected]>
  L:    [email protected] (subscribers-only)
@@@ -5742,49 -5694,6 +5743,49 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 +M:    Tejun Heo <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/
 +F:    include/linux/ata.h
 +F:    include/linux/libata.h
 +
 +LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 +M:    Viresh Kumar <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    include/linux/pata_arasan_cf_data.h
 +F:    drivers/ata/pata_arasan_cf.c
 +
 +LIBATA PATA DRIVERS
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
 +M:    Tejun Heo <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/pata_*.c
 +F:    drivers/ata/ata_generic.c
 +
 +LIBATA SATA AHCI PLATFORM devices support
 +M:    Hans de Goede <[email protected]>
 +M:    Tejun Heo <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/ahci_platform.c
 +F:    drivers/ata/libahci_platform.c
 +F:    include/linux/ahci_platform.h
 +
 +LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
 +M:    Mikael Pettersson <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/sata_promise.*
 +
  LIBLOCKDEP
  M:    Sasha Levin <[email protected]>
  S:    Maintained
@@@ -5876,21 -5785,6 +5877,21 @@@ F:    Documentation/misc-devices/lis3lv02
  F:    drivers/misc/lis3lv02d/
  F:    drivers/platform/x86/hp_accel.c
  
 +LIVE PATCHING
 +M:    Josh Poimboeuf <[email protected]>
 +M:    Seth Jennings <[email protected]>
 +M:    Jiri Kosina <[email protected]>
 +M:    Vojtech Pavlik <[email protected]>
 +S:    Maintained
 +F:    kernel/livepatch/
 +F:    include/linux/livepatch.h
 +F:    arch/x86/include/asm/livepatch.h
 +F:    arch/x86/kernel/livepatch.c
 +F:    Documentation/ABI/testing/sysfs-kernel-livepatch
 +F:    samples/livepatch/
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
 +
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <[email protected]>
  S:    Maintained
@@@ -6189,13 -6083,6 +6190,13 @@@ F:    Documentation/devicetree/bindings/i2
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
  
 +MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 +M:    Krzysztof Kozlowski <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/power/max14577_charger.c
 +F:    drivers/power/max77693_charger.c
 +
  MAXIRADIO FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
@@@ -6226,6 -6113,14 +6227,6 @@@ F:     include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 -MEDIAVISION PRO MOVIE STUDIO DRIVER
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/parport/pms*
 -
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <[email protected]>
  M:    Sumit Saxena <[email protected]>
@@@ -6643,10 -6538,9 +6644,10 @@@ F:    include/uapi/linux/netrom.
  F:    net/netrom/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Paul Clements <[email protected]>
 +M:    Markus Pargmann <[email protected]>
  S:    Maintained
  L:    [email protected]
 +T:    git git://git.pengutronix.de/git/mpa/linux-nbd.git
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
@@@ -6675,7 -6569,6 +6676,7 @@@ F:      include/linux/netdevice.
  F:    include/uapi/linux/in.h
  F:    include/uapi/linux/net.h
  F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/net_namespace.h
  F:    tools/net/
  F:    tools/testing/selftests/net/
  F:    lib/random32.c
@@@ -6780,7 -6673,6 +6781,7 @@@ F:      Documentation/devicetree/bindings/ne
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <[email protected]>
 +M:    Anna Schumaker <[email protected]>
  L:    [email protected]
  W:    http://client.linux-nfs.org
  T:    git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
@@@ -7086,12 -6978,14 +7087,12 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Grant Likely <[email protected]>
  M:    Rob Herring <[email protected]>
  L:    [email protected]
 -W:    http://fdt.secretlab.ca
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
 +W:    http://www.devicetree.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
  S:    Maintained
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 -K:    of_get_property
 -K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <[email protected]>
@@@ -7115,12 -7009,11 +7116,12 @@@ F:   arch/openrisc
  
  OPENVSWITCH
  M:    Pravin Shelar <[email protected]>
 +L:    [email protected]
  L:    [email protected]
  W:    http://openvswitch.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
  S:    Maintained
  F:    net/openvswitch/
 +F:    include/uapi/linux/openvswitch.h
  
  OPL4 DRIVER
  M:    Clemens Ladisch <[email protected]>
@@@ -7318,14 -7211,6 +7319,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR ARM VERSATILE PLATFORM
 +M:    Rob Herring <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/versatile.txt
 +F:    drivers/pci/host/pci-versatile.c
 +
  PCI DRIVER FOR APPLIEDMICRO XGENE
  M:    Tanmay Inamdar <[email protected]>
  L:    [email protected]
@@@ -7345,7 -7230,7 +7346,7 @@@ S:      Maintaine
  F:    drivers/pci/host/*layerscape*
  
  PCI DRIVER FOR IMX6
 -M:    Richard Zhu <r65037@freescale.com>
 +M:    Richard Zhu <Richard.Zhu@freescale.com>
  M:    Lucas Stach <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -7515,7 -7400,6 +7516,7 @@@ F:      drivers/crypto/picoxcell
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
@@@ -7683,6 -7567,12 +7684,6 @@@ W:     http://wireless.kernel.org/en/users/
  S:    Obsolete
  F:    drivers/net/wireless/prism54/
  
 -PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
 -M:    Mikael Pettersson <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/ata/sata_promise.*
 -
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <[email protected]>
  L:    [email protected]
@@@ -7848,7 -7738,8 +7849,7 @@@ F:      Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    Vikas Chaudhary <[email protected]>
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla4xxx
@@@ -7927,6 -7818,14 +7928,6 @@@ T:     git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 -QUICKCAM PARALLEL PORT WEBCAMS
 -M:    Hans Verkuil <[email protected]>
 -L:    [email protected]
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/parport/*-qcam*
 -
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <[email protected]>
  M:    Sage Weil <[email protected]>
@@@ -8115,13 -8014,6 +8116,13 @@@ S:    Maintaine
  F:    Documentation/rfkill.txt
  F:    net/rfkill/
  
 +RHASHTABLE
 +M:    Thomas Graf <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    lib/rhashtable.c
 +F:    include/linux/rhashtable.h
 +
  RICOH SMARTMEDIA/XD DRIVER
  M:    Maxim Levitsky <[email protected]>
  S:    Maintained
@@@ -8464,6 -8356,12 +8465,6 @@@ F:     kernel/time/clocksource.
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
  
 -TLG2300 VIDEO4LINUX-2 DRIVER
 -M:    Huang Shijie <[email protected]>
 -M:    Hans Verkuil <[email protected]>
 -S:    Odd Fixes
 -F:    drivers/media/usb/tlg2300/
 -
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <[email protected]>
  S:    Maintained
@@@ -8649,6 -8547,25 +8650,6 @@@ S:     Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 -SERIAL ATA (SATA) SUBSYSTEM
 -M:    Tejun Heo <[email protected]>
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Supported
 -F:    drivers/ata/
 -F:    include/linux/ata.h
 -F:    include/linux/libata.h
 -
 -SERIAL ATA AHCI PLATFORM devices support
 -M:    Hans de Goede <[email protected]>
 -M:    Tejun Heo <[email protected]>
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Supported
 -F:    drivers/ata/ahci_platform.c
 -F:    drivers/ata/libahci_platform.c
 -F:    include/linux/ahci_platform.h
 -
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
  M:    Jayamohan Kallickal <[email protected]>
  L:    [email protected]
@@@ -8829,15 -8746,6 +8830,15 @@@ S:    Maintaine
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
 +TI AM437X VPFE DRIVER
 +M:    Lad, Prabhakar <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/platform/am437x/
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
@@@ -8919,8 -8827,6 +8920,8 @@@ F:      drivers/media/i2c/smiapp
  F:    include/media/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
 +F:    include/uapi/linux/smiapp.h
 +F:    Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
  
  SMM665 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <[email protected]>
@@@ -8987,7 -8893,6 +8988,7 @@@ SOFTLOGIC 6x10 MPEG CODE
  M:    Bluecherry Maintainers <[email protected]>
  M:    Andrey Utkin <[email protected]>
  M:    Andrey Utkin <[email protected]>
 +M:    Ismael Luceno <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/media/pci/solo6x10/
@@@ -9300,13 -9205,6 +9301,13 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER
 +M:    Hans de Goede <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
 +F:    drivers/input/keyboard/sun4i-lradc-keys.c
 +
  SUNDANCE NETWORK DRIVER
  M:    Denis Kirjanov <[email protected]>
  L:    [email protected]
@@@ -9315,6 -9213,7 +9316,6 @@@ F:      drivers/net/ethernet/dlink/sundance.
  
  SUPERH
  L:    [email protected]
 -W:    http://www.linux-sh.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
  S:    Orphan
  F:    Documentation/sh/
@@@ -9635,8 -9534,7 +9636,8 @@@ F:      drivers/platform/x86/thinkpad_acpi.
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <[email protected]>
  L:    [email protected]
 -S:    Supported
 +L:    [email protected]
 +S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
  TI CLOCK DRIVER
@@@ -9693,13 -9591,6 +9694,13 @@@ F:    drivers/power/lp8788-charger.
  F:    drivers/regulator/lp8788-*.c
  F:    include/linux/mfd/lp8788*.h
  
 +TI NETCP ETHERNET DRIVER
 +M:    Wingman Kwok <[email protected]>
 +M:    Murali Karicheri <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/ti/netcp*
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -9727,7 -9618,7 +9728,7 @@@ F:      net/tipc
  
  TILE ARCHITECTURE
  M:    Chris Metcalf <[email protected]>
 -W:    http://www.tilera.com/scm/
 +W:    http://www.ezchip.com/scm/
  S:    Supported
  F:    arch/tile/
  F:    drivers/char/tile-srom.c
@@@ -9820,21 -9711,13 +9821,21 @@@ F:   drivers/media/pci/tw68
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <[email protected]>
 -M:    Ashley Lai <[email protected]>
  M:    Marcel Selhorst <[email protected]>
  W:    http://tpmdd.sourceforge.net
  L:    [email protected] (moderated for non-subscribers)
 +Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 +T:    https://github.com/PeterHuewe/linux-tpmdd
  S:    Maintained
  F:    drivers/char/tpm/
  
 +TPM IBM_VTPM DEVICE DRIVER
 +M:    Ashley Lai <[email protected]>
 +W:    http://tpmdd.sourceforge.net
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/char/tpm/tpm_ibmvtpm*
 +
  TRACING
  M:    Steven Rostedt <[email protected]>
  M:    Ingo Molnar <[email protected]>
@@@ -10264,7 -10147,6 +10265,7 @@@ USERSPACE I/O (UIO
  M:    "Hans J. Koch" <[email protected]>
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/DocBook/uio-howto.tmpl
  F:    drivers/uio/
  F:    include/linux/uio*.h
@@@ -10692,7 -10574,6 +10693,7 @@@ F:   drivers/pci/*xen
  
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
 +M:    Roger Pau Monné <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    drivers/block/xen-blkback/*
@@@ -10748,7 -10629,6 +10749,7 @@@ M:   Max Filippov <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/spi/spi-xtensa-xtfpga.c
 +F:    sound/soc/xtensa/xtfpga-i2s.c
  
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <[email protected]>

diff --combined crypto/af_alg.c
index 3e80d8b8be4571fa89185df5bb4883427c37764b,76d739d08211892c37f2f1be5162fa6c58ad0187..7f8b7edcadca3f64168e3451e52642a485a5d51f
--- 1/crypto/af_alg.c
--- 2/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@@ -188,7 -188,7 +188,7 @@@ static int alg_setkey(struct sock *sk, 
        err = type->setkey(ask->private, key, keylen);
  
  out:
-       sock_kfree_s(sk, key, keylen);
+       sock_kzfree_s(sk, key, keylen);
  
        return err;
  }
@@@ -215,6 -215,13 +215,13 @@@ static int alg_setsockopt(struct socke
                        goto unlock;
  
                err = alg_setkey(sk, optval, optlen);
+               break;
+       case ALG_SET_AEAD_AUTHSIZE:
+               if (sock->state == SS_CONNECTED)
+                       goto unlock;
+               if (!type->setauthsize)
+                       goto unlock;
+               err = type->setauthsize(ask->private, optlen);
        }
  
  unlock:
@@@ -338,31 -345,49 +345,31 @@@ static const struct net_proto_family al
        .owner  =       THIS_MODULE,
  };
  
 -int af_alg_make_sg(struct af_alg_sgl *sgl, void __user *addr, int len,
 -                 int write)
 +int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len)
  {
 -      unsigned long from = (unsigned long)addr;
 -      unsigned long npages;
 -      unsigned off;
 -      int err;
 -      int i;
 -
 -      err = -EFAULT;
 -      if (!access_ok(write ? VERIFY_READ : VERIFY_WRITE, addr, len))
 -              goto out;
 -
 -      off = from & ~PAGE_MASK;
 -      npages = (off + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
 -      if (npages > ALG_MAX_PAGES)
 -              npages = ALG_MAX_PAGES;
 +      size_t off;
 +      ssize_t n;
 +      int npages, i;
  
 -      err = get_user_pages_fast(from, npages, write, sgl->pages);
 -      if (err < 0)
 -              goto out;
 +      n = iov_iter_get_pages(iter, sgl->pages, len, ALG_MAX_PAGES, &off);
 +      if (n < 0)
 +              return n;
  
 -      npages = err;
 -      err = -EINVAL;
 +      npages = (off + n + PAGE_SIZE - 1) >> PAGE_SHIFT;
        if (WARN_ON(npages == 0))
 -              goto out;
 -
 -      err = 0;
 +              return -EINVAL;
  
        sg_init_table(sgl->sg, npages);
  
 -      for (i = 0; i < npages; i++) {
 +      for (i = 0, len = n; i < npages; i++) {
                int plen = min_t(int, len, PAGE_SIZE - off);
  
                sg_set_page(sgl->sg + i, sgl->pages[i], plen, off);
  
                off = 0;
                len -= plen;
 -              err += plen;
        }
 -
 -out:
 -      return err;
 +      return n;
  }
  EXPORT_SYMBOL_GPL(af_alg_make_sg);
  
@@@ -387,7 -412,7 +394,7 @@@ int af_alg_cmsg_send(struct msghdr *msg
                if (cmsg->cmsg_level != SOL_ALG)
                        continue;
  
-               switch(cmsg->cmsg_type) {
+               switch (cmsg->cmsg_type) {
                case ALG_SET_IV:
                        if (cmsg->cmsg_len < CMSG_LEN(sizeof(*con->iv)))
                                return -EINVAL;

diff --combined crypto/algif_skcipher.c
index 6fc12c3fc4b9f6d3684fa6adee6dc1ccdd96c8e3,38a6757e3cccdbfbff707870e09ad59e153925d3..0c8a1e5ccadf7d1ca16d9da3bd1042e3ff724177
--- 1/crypto/algif_skcipher.c
--- 2/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@@ -330,6 -330,7 +330,7 @@@ static int skcipher_sendmsg(struct kioc
  
                sgl = list_entry(ctx->tsgl.prev, struct skcipher_sg_list, list);
                sg = sgl->sg;
+               sg_unmark_end(sg + sgl->cur);
                do {
                        i = sgl->cur;
                        plen = min_t(int, len, PAGE_SIZE);
@@@ -355,6 -356,9 +356,9 @@@
                        sgl->cur++;
                } while (len && sgl->cur < MAX_SGL_ENTS);
  
+               if (!size)
+                       sg_mark_end(sg + sgl->cur - 1);
+ 
                ctx->merge = plen & (PAGE_SIZE - 1);
        }
  
@@@ -401,6 -405,10 +405,10 @@@ static ssize_t skcipher_sendpage(struc
        ctx->merge = 0;
        sgl = list_entry(ctx->tsgl.prev, struct skcipher_sg_list, list);
  
+       if (sgl->cur)
+               sg_unmark_end(sgl->sg + sgl->cur - 1);
+ 
+       sg_mark_end(sgl->sg + sgl->cur);
        get_page(page);
        sg_set_page(sgl->sg + sgl->cur, page, size, offset);
        sgl->cur++;
@@@ -426,58 -434,67 +434,58 @@@ static int skcipher_recvmsg(struct kioc
                &ctx->req));
        struct skcipher_sg_list *sgl;
        struct scatterlist *sg;
 -      unsigned long iovlen;
 -      const struct iovec *iov;
        int err = -EAGAIN;
        int used;
        long copied = 0;
  
        lock_sock(sk);
 -      for (iov = msg->msg_iter.iov, iovlen = msg->msg_iter.nr_segs; iovlen > 0;
 -           iovlen--, iov++) {
 -              unsigned long seglen = iov->iov_len;
 -              char __user *from = iov->iov_base;
 -
 -              while (seglen) {
 -                      sgl = list_first_entry(&ctx->tsgl,
 -                                             struct skcipher_sg_list, list);
 -                      sg = sgl->sg;
 -
 -                      while (!sg->length)
 -                              sg++;
 -
 -                      if (!ctx->used) {
 -                              err = skcipher_wait_for_data(sk, flags);
 -                              if (err)
 -                                      goto unlock;
 -                      }
 +      while (iov_iter_count(&msg->msg_iter)) {
 +              sgl = list_first_entry(&ctx->tsgl,
 +                                     struct skcipher_sg_list, list);
 +              sg = sgl->sg;
  
 -                      used = min_t(unsigned long, ctx->used, seglen);
 +              while (!sg->length)
 +                      sg++;
  
 -                      used = af_alg_make_sg(&ctx->rsgl, from, used, 1);
 -                      err = used;
 -                      if (err < 0)
 +              if (!ctx->used) {
 +                      err = skcipher_wait_for_data(sk, flags);
 +                      if (err)
                                goto unlock;
 +              }
 +
 +              used = min_t(unsigned long, ctx->used, iov_iter_count(&msg->msg_iter));
 +
 +              used = af_alg_make_sg(&ctx->rsgl, &msg->msg_iter, used);
 +              err = used;
 +              if (err < 0)
 +                      goto unlock;
  
 -                      if (ctx->more || used < ctx->used)
 -                              used -= used % bs;
 +              if (ctx->more || used < ctx->used)
 +                      used -= used % bs;
  
 -                      err = -EINVAL;
 -                      if (!used)
 -                              goto free;
 +              err = -EINVAL;
 +              if (!used)
 +                      goto free;
  
 -                      ablkcipher_request_set_crypt(&ctx->req, sg,
 -                                                   ctx->rsgl.sg, used,
 -                                                   ctx->iv);
 +              ablkcipher_request_set_crypt(&ctx->req, sg,
 +                                           ctx->rsgl.sg, used,
 +                                           ctx->iv);
  
 -                      err = af_alg_wait_for_completion(
 +              err = af_alg_wait_for_completion(
                                ctx->enc ?
                                        crypto_ablkcipher_encrypt(&ctx->req) :
                                        crypto_ablkcipher_decrypt(&ctx->req),
                                &ctx->completion);
  
  free:
 -                      af_alg_free_sg(&ctx->rsgl);
 +              af_alg_free_sg(&ctx->rsgl);
  
 -                      if (err)
 -                              goto unlock;
 +              if (err)
 +                      goto unlock;
  
 -                      copied += used;
 -                      from += used;
 -                      seglen -= used;
 -                      skcipher_pull_sgl(sk, used);
 -              }
 +              copied += used;
 +              skcipher_pull_sgl(sk, used);
 +              iov_iter_advance(&msg->msg_iter, used);
        }
  
        err = 0;

diff --combined include/crypto/if_alg.h
index 88ea64e9a91ce5df933a84ff8cfdc4ec3e66b5d0,5c7b6c53e96f17edbf530c1c5f7c10ce59c73de0..178525e5f430ba99f70a8f8250937501b46a650d
--- 1/include/crypto/if_alg.h
--- 2/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
@@@ -50,6 -50,7 +50,7 @@@ struct af_alg_type 
        void (*release)(void *private);
        int (*setkey)(void *private, const u8 *key, unsigned int keylen);
        int (*accept)(void *private, struct sock *sk);
+       int (*setauthsize)(void *private, unsigned int authsize);
  
        struct proto_ops *ops;
        struct module *owner;
@@@ -67,7 -68,8 +68,7 @@@ int af_alg_unregister_type(const struc
  int af_alg_release(struct socket *sock);
  int af_alg_accept(struct sock *sk, struct socket *newsock);
  
 -int af_alg_make_sg(struct af_alg_sgl *sgl, void __user *addr, int len,
 -                 int write);
 +int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len);
  void af_alg_free_sg(struct af_alg_sgl *sgl);
  
  int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con);

diff --combined lib/string.c
index cdd97f431ae261bd270982cfab0867f3bfb45036,d984ec4fd3b71e8aff439e87eba9e96fb85e9e13..ce81aaec38391b0fb68cef2f5ba070c9a520e49e
--- 1/lib/string.c
--- 2/lib/string.c
+++ b/lib/string.c
@@@ -58,6 -58,14 +58,6 @@@ int strncasecmp(const char *s1, const c
  }
  EXPORT_SYMBOL(strncasecmp);
  #endif
 -#ifndef __HAVE_ARCH_STRNICMP
 -#undef strnicmp
 -int strnicmp(const char *s1, const char *s2, size_t len)
 -{
 -      return strncasecmp(s1, s2, len);
 -}
 -EXPORT_SYMBOL(strnicmp);
 -#endif
  
  #ifndef __HAVE_ARCH_STRCASECMP
  int strcasecmp(const char *s1, const char *s2)
@@@ -313,12 -321,12 +313,12 @@@ EXPORT_SYMBOL(strchrnul)
   */
  char *strrchr(const char *s, int c)
  {
 -       const char *p = s + strlen(s);
 -       do {
 -           if (*p == (char)c)
 -               return (char *)p;
 -       } while (--p >= s);
 -       return NULL;
 +      const char *last = NULL;
 +      do {
 +              if (*s == (char)c)
 +                      last = s;
 +      } while (*s++);
 +      return (char *)last;
  }
  EXPORT_SYMBOL(strrchr);
  #endif
@@@ -596,6 -604,11 +596,11 @@@ EXPORT_SYMBOL(memset)
   * @s: Pointer to the start of the area.
   * @count: The size of the area.
   *
+  * Note: usually using memset() is just fine (!), but in cases
+  * where clearing out _local_ data at the end of a scope is
+  * necessary, memzero_explicit() should be used instead in
+  * order to prevent the compiler from optimising away zeroing.
+  *
   * memzero_explicit() doesn't need an arch-specific version as
   * it just invokes the one of memset() implicitly.
   */