Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Apr 2019 16:15:03 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Apr 2019 16:15:03 +0000 (09:15 -0700)
commitf6f3e747454fc539bbd7904cf70672368289d820
tree3eaf09808e449c370cf7c3e81d9aa6ea2f414099
parentcd8dead0c39457e58ec1d36db93aedca811d48f1
parentb257b48cd5830c5b1d0c347eb281f9c28056f881
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a bug in xts and lrw where they may sleep in an atomic
  context"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: lrw - Fix atomic sleep when walking skcipher
  crypto: xts - Fix atomic sleep when walking skcipher