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

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

  API:
   - Test shash interface directly in testmgr
   - cra_driver_name is now mandatory

  Algorithms:
   - Replace arc4 crypto_cipher with library helper
   - Implement 5 way interleave for ECB, CBC and CTR on arm64
   - Add xxhash
   - Add continuous self-test on noise source to drbg
   - Update jitter RNG

  Drivers:
   - Add support for SHA204A random number generator
   - Add support for 7211 in iproc-rng200
   - Fix fuzz test failures in inside-secure
   - Fix fuzz test failures in talitos
   - Fix fuzz test failures in qat"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (143 commits)
  crypto: stm32/hash - remove interruptible condition for dma
  crypto: stm32/hash - Fix hmac issue more than 256 bytes
  crypto: stm32/crc32 - rename driver file
  crypto: amcc - remove memset after dma_alloc_coherent
  crypto: ccp - Switch to SPDX license identifiers
  crypto: ccp - Validate the the error value used to index error messages
  crypto: doc - Fix formatting of new crypto engine content
  crypto: doc - Add parameter documentation
  crypto: arm64/aes-ce - implement 5 way interleave for ECB, CBC and CTR
  crypto: arm64/aes-ce - add 5 way interleave routines
  crypto: talitos - drop icv_ool
  crypto: talitos - fix hash on SEC1.
  crypto: talitos - move struct talitos_edesc into talitos.h
  lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE
  crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
  crypto: asymmetric_keys - select CRYPTO_HASH where needed
  crypto: serpent - mark __serpent_setkey_sbox noinline
  crypto: testmgr - dynamically allocate crypto_shash
  crypto: testmgr - dynamically allocate testvec_config
  crypto: talitos - eliminate unneeded 'done' functions at build time
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/crypto/sha512-glue.c
Simple merge

diff --cc arch/arm64/crypto/aes-ce.S
Simple merge

diff --cc arch/arm64/crypto/aes-modes.S
Simple merge

diff --cc arch/arm64/crypto/aes-neon.S
Simple merge

diff --cc arch/arm64/crypto/sha1-ce-glue.c
Simple merge

diff --cc arch/arm64/crypto/sha2-ce-glue.c
Simple merge

diff --cc arch/x86/crypto/aesni-intel_glue.c
Simple merge

diff --cc arch/x86/crypto/chacha_glue.c
Simple merge

diff --cc crypto/aead.c
Simple merge

diff --cc crypto/algapi.c
Simple merge

diff --cc crypto/arc4.c
Simple merge

diff --cc crypto/chacha20poly1305.c
Simple merge

diff --cc crypto/chacha_generic.c
Simple merge

diff --cc crypto/cryptd.c
Simple merge

diff --cc crypto/crypto_null.c
Simple merge

diff --cc crypto/deflate.c
Simple merge

diff --cc crypto/ghash-generic.c
Simple merge

diff --cc crypto/lrw.c
Simple merge

diff --cc crypto/lz4.c
Simple merge

diff --cc crypto/lz4hc.c
Simple merge

diff --cc crypto/lzo-rle.c
Simple merge

diff --cc crypto/lzo.c
Simple merge

diff --cc crypto/michael_mic.c
Simple merge

diff --cc crypto/rmd128.c
Simple merge

diff --cc crypto/rmd160.c
Simple merge

diff --cc crypto/rmd256.c
Simple merge

diff --cc crypto/rmd320.c
Simple merge

diff --cc crypto/serpent_generic.c
Simple merge

diff --cc crypto/skcipher.c
Simple merge

diff --cc crypto/tea.c
Simple merge

diff --cc crypto/testmgr.c
Simple merge

diff --cc crypto/testmgr.h
Simple merge

diff --cc crypto/tgr192.c
Simple merge

diff --cc crypto/zstd.c
Simple merge

diff --cc drivers/crypto/Kconfig
Simple merge

diff --cc drivers/crypto/amcc/crypto4xx_alg.c
Simple merge

diff --cc drivers/crypto/amcc/crypto4xx_core.c
Simple merge

diff --cc drivers/crypto/amcc/crypto4xx_core.h
Simple merge

diff --cc drivers/crypto/bcm/cipher.c
Simple merge

diff --cc drivers/crypto/bcm/spu2.c
Simple merge

diff --cc drivers/crypto/cavium/cpt/cptvf_algs.c
Simple merge

diff --cc drivers/crypto/ccp/ccp-crypto-aes.c
Simple merge

diff --cc drivers/crypto/ccp/ccp-dev.c
Simple merge

diff --cc drivers/crypto/ccp/ccp-dev.h
Simple merge

diff --cc drivers/crypto/ccp/ccp-ops.c
Simple merge

diff --cc drivers/crypto/ixp4xx_crypto.c
Simple merge

diff --cc drivers/crypto/mxs-dcp.c
Simple merge

diff --cc drivers/crypto/nx/nx-842-powernv.c
Simple merge

diff --cc drivers/crypto/nx/nx.c
Simple merge

diff --cc drivers/crypto/nx/nx_debugfs.c
Simple merge

diff --cc drivers/crypto/sahara.c
Simple merge

diff --cc drivers/crypto/stm32/Makefile
index ce77e38c77e00215429a238759e7567d0e400d11,23ce3bc46989c721ead1be4fbabcda9b0a8b42f2..518e0e0b11a9eeffab1aa9269adebc92c3cf47b9
--- 1/drivers/crypto/stm32/Makefile
--- 2/drivers/crypto/stm32/Makefile
+++ b/drivers/crypto/stm32/Makefile
@@@ -1,4 -1,3 +1,4 @@@
- obj-$(CONFIG_CRYPTO_DEV_STM32_CRC) += stm32_crc32.o
 +# SPDX-License-Identifier: GPL-2.0-only
+ obj-$(CONFIG_CRYPTO_DEV_STM32_CRC) += stm32-crc32.o
  obj-$(CONFIG_CRYPTO_DEV_STM32_HASH) += stm32-hash.o
  obj-$(CONFIG_CRYPTO_DEV_STM32_CRYP) += stm32-cryp.o

diff --cc drivers/crypto/stm32/stm32-crc32.c
Simple merge

diff --cc drivers/crypto/stm32/stm32-hash.c
Simple merge

diff --cc drivers/crypto/sunxi-ss/sun4i-ss-cipher.c
Simple merge

diff --cc drivers/crypto/talitos.c
Simple merge

diff --cc drivers/crypto/vmx/aes_cbc.c
Simple merge

diff --cc drivers/crypto/vmx/aes_ctr.c
Simple merge

diff --cc drivers/crypto/vmx/aes_xts.c
Simple merge

diff --cc drivers/crypto/vmx/vmx.c
Simple merge

diff --cc drivers/i2c/i2c-core-acpi.c
Simple merge

diff --cc drivers/net/ppp/Kconfig
Simple merge

diff --cc drivers/net/ppp/ppp_mppe.c
index 66c8e65f68720c5a6b30277b872b88dc342991f7,de3b57d09d0cb10a552e1fc22f8965a8e8054d82..bd3c80b0bc77d7bbb6f78c5d7578c6914898f981
--- 1/drivers/net/ppp/ppp_mppe.c
--- 2/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@@ -63,16 -64,8 +64,9 @@@ MODULE_AUTHOR("Frank Cusack <fcusack@fc
  MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support");
  MODULE_LICENSE("Dual BSD/GPL");
  MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
 +MODULE_SOFTDEP("pre: arc4");
  MODULE_VERSION("1.0.2");
  
- static unsigned int
- setup_sg(struct scatterlist *sg, const void *address, unsigned int length)
- {
-       sg_set_buf(sg, address, length);
-       return length;
- }
- 
  #define SHA1_PAD_SIZE 40
  
  /*

diff --cc fs/cifs/Kconfig
Simple merge

diff --cc fs/cifs/cifsfs.c
Simple merge

diff --cc include/crypto/aead.h
Simple merge

diff --cc include/crypto/algapi.h
Simple merge

diff --cc include/crypto/internal/hash.h
Simple merge

diff --cc include/crypto/internal/skcipher.h
Simple merge

diff --cc include/crypto/skcipher.h
Simple merge

diff --cc include/linux/crypto.h
Simple merge

diff --cc lib/scatterlist.c
Simple merge

diff --cc net/mac80211/Kconfig
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/key.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/tkip.c
Simple merge

diff --cc net/mac80211/tkip.h
Simple merge

diff --cc net/mac80211/wep.c
Simple merge

diff --cc net/mac80211/wep.h
Simple merge

diff --cc net/mac80211/wpa.c
Simple merge

diff --cc net/wireless/Kconfig
Simple merge

diff --cc net/wireless/lib80211_crypt_tkip.c
Simple merge

diff --cc net/wireless/lib80211_crypt_wep.c
Simple merge