tree daf5612c631585dbcaa426ccd38ac28308373537
parent 43f462f1c2e111d2882b48baeeff774ae42e7c56
parent c14ca8386539a298c1c19b003fe55e37d0f0e89c
author Linus Torvalds <torvalds@linux-foundation.org> 1511914930 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1511914930 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/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