Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Nov 2017 00:22:10 +0000 (16:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Nov 2017 00:22:10 +0000 (16:22 -0800)
commit43570f0383d6d5879ae585e6c3cf027ba321546f
treedaf5612c631585dbcaa426ccd38ac28308373537
parent43f462f1c2e111d2882b48baeeff774ae42e7c56
parentc14ca8386539a298c1c19b003fe55e37d0f0e89c
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:

 - avoid potential bogus alignment for some AEAD operations

 - fix crash in algif_aead

 - avoid sleeping in softirq context with async af_alg

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - Fix skcipher_walk_aead_common
  crypto: af_alg - remove locking in async callback
  crypto: algif_aead - skip SGL entries with NULL page
crypto/skcipher.c