]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/stable-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Fri, 20 Jan 2017 10:08:32 +0000 (02:08 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Fri, 20 Jan 2017 10:08:32 +0000 (02:08 -0800)
* topic/uek-4.1/stable-cherry-picks:
  crypto: skcipher - Fix blkcipher walk OOM crash
  crypto: cryptd - initialize child shash_desc on import
  crypto: scatterwalk - Fix test in scatterwalk_done
  crypto: gcm - Filter out async ghash if necessary
  PKCS#7: pkcs7_validate_trust(): initialize the _trusted output argument
  crypto: public_key: select CRYPTO_AKCIPHER
  crypto: hash - Fix page length clamping in hash walk

1  2 
crypto/asymmetric_keys/Kconfig
crypto/blkcipher.c
crypto/cryptd.c
crypto/gcm.c
crypto/scatterwalk.c

Simple merge
Simple merge
diff --cc crypto/cryptd.c
Simple merge
diff --cc crypto/gcm.c
Simple merge
Simple merge