From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 17 Nov 2019 02:14:32 +0000 (-0800)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.4-rc8~4
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8;p=linux-2.6-block.git

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

Pull crypto fix from Herbert Xu:
 "This reverts a number of changes to the khwrng thread which feeds the
  kernel random number pool from hwrng drivers. They were trying to fix
  issues with suspend-and-resume but ended up causing regressions"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  Revert "hwrng: core - Freeze khwrng thread during suspend"
---

1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8