git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe30021 08e97ae)
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)
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"

1  2 
drivers/char/random.c patch | diff1 | diff2 | blob | history

diff --cc drivers/char/random.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.