From: Linus Torvalds Date: Thu, 25 Apr 2019 16:15:03 +0000 (-0700) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f6f3e747454fc539bbd7904cf70672368289d820;p=openwrt%2Fstaging%2Fblogic.git 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 --- f6f3e747454fc539bbd7904cf70672368289d820