Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Nov 2019 02:14:32 +0000 (18:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Nov 2019 02:14:32 +0000 (18:14 -0800)
commit1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8
tree63dd536eb24e25eb2f2f863df2d532f0fc14fead
parentfe30021c36fbfb71d6ff25a424342149e58bba52
parent08e97aec700aeff54c4847f170e566cbd7e14e81
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"
drivers/char/random.c