From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Nov 2017 00:22:10 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.15-rc2~29
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=43570f0383d6d5879ae585e6c3cf027ba321546f;p=linux-2.6-block.git

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
---

43570f0383d6d5879ae585e6c3cf027ba321546f