Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Sep 2020 02:46:22 +0000 (19:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Sep 2020 02:46:22 +0000 (19:46 -0700)
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


Trivial merge