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

Pull crypto updates from Herbert Xu:
 "API:
   - Add 1472-byte test to tcrypt for IPsec
   - Reintroduced crypto stats interface with numerous changes
   - Support incremental algorithm dumps

  Algorithms:
   - Add xchacha12/20
   - Add nhpoly1305
   - Add adiantum
   - Add streebog hash
   - Mark cts(cbc(aes)) as FIPS allowed

  Drivers:
   - Improve performance of arm64/chacha20
   - Improve performance of x86/chacha20
   - Add NEON-accelerated nhpoly1305
   - Add SSE2 accelerated nhpoly1305
   - Add AVX2 accelerated nhpoly1305
   - Add support for 192/256-bit keys in gcmaes AVX
   - Add SG support in gcmaes AVX
   - ESN for inline IPsec tx in chcr
   - Add support for CryptoCell 703 in ccree
   - Add support for CryptoCell 713 in ccree
   - Add SM4 support in ccree
   - Add SM3 support in ccree
   - Add support for chacha20 in caam/qi2
   - Add support for chacha20 + poly1305 in caam/jr
   - Add support for chacha20 + poly1305 in caam/qi2
   - Add AEAD cipher support in cavium/nitrox"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (130 commits)
  crypto: skcipher - remove remnants of internal IV generators
  crypto: cavium/nitrox - Fix build with !CONFIG_DEBUG_FS
  crypto: salsa20-generic - don't unnecessarily use atomic walk
  crypto: skcipher - add might_sleep() to skcipher_walk_virt()
  crypto: x86/chacha - avoid sleeping under kernel_fpu_begin()
  crypto: cavium/nitrox - Added AEAD cipher support
  crypto: mxc-scc - fix build warnings on ARM64
  crypto: api - document missing stats member
  crypto: user - remove unused dump functions
  crypto: chelsio - Fix wrong error counter increments
  crypto: chelsio - Reset counters on cxgb4 Detach
  crypto: chelsio - Handle PCI shutdown event
  crypto: chelsio - cleanup:send addr as value in function argument
  crypto: chelsio - Use same value for both channel in single WR
  crypto: chelsio - Swap location of AAD and IV sent in WR
  crypto: chelsio - remove set but not used variable 'kctx_len'
  crypto: ux500 - Use proper enum in hash_set_dma_transfer
  crypto: ux500 - Use proper enum in cryp_set_dma_transfer
  crypto: aesni - Add scatter/gather avx stubs, and use them in C
  crypto: aesni - Introduce partial block macro
  ..

diff --cc MAINTAINERS
Simple merge

diff --cc crypto/pcrypt.c
Simple merge

diff --cc drivers/crypto/chelsio/chcr_ipsec.c
index ceaa16b8f72efb933d934a416878041ef12c2af8,82ca33126786a4c14f75568e8aa601c830a3441e..2fb48cce4462033d2601acfb24ba160369636aaf
--- 1/drivers/crypto/chelsio/chcr_ipsec.c
--- 2/drivers/crypto/chelsio/chcr_ipsec.c
+++ b/drivers/crypto/chelsio/chcr_ipsec.c
@@@ -577,10 -682,8 +683,9 @@@ int chcr_ipsec_xmit(struct sk_buff *skb
                return NETDEV_TX_BUSY;
  
        sa_entry = (struct ipsec_sa_entry *)x->xso.offload_handle;
-       kctx_len = sa_entry->kctx_len;
  
 -      if (skb->sp->len != 1) {
 +      sp = skb_sec_path(skb);
 +      if (sp->len != 1) {
  out_free:       dev_kfree_skb_any(skb);
                return NETDEV_TX_OK;
        }

diff --cc drivers/net/wireless/cisco/airo.c
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc security/integrity/evm/evm_crypto.c
Simple merge

diff --cc security/keys/trusted.c
Simple merge