From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Sep 2020 02:46:22 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.15~2938
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fe10096c1508c7f033d34d0741809f8eecc1ed4;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a regression in padata"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  padata: fix possible padata_works_lock deadlock
---

7fe10096c1508c7f033d34d0741809f8eecc1ed4