Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Nov 2016 09:11:50 +0000 (01:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Nov 2016 09:11:50 +0000 (01:11 -0800)
commit23aabe73d53c29ee8da71397f87f190bdcde5b68
tree05a0365d3a344cd5f66caa26d4734248beedd741
parent23400ac997062647f2b63c82030d189671b1effe
parentc8467f7a3620698bf3c22f0e199b550fb611a8ae
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "The last push broke algif_hash for all shash implementations, so this
  is a follow-up to fix that.

  This also fixes a problem in the crypto scatterwalk that triggers a
  BUG_ON with certain debugging options due to the new vmalloced-stack
  code"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: scatterwalk - Remove unnecessary aliasing check in map_and_copy
  crypto: algif_hash - Fix result clobbering in recvmsg