diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-16 18:14:32 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-16 18:14:32 -0800 |
| commit | 1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8 (patch) | |
| tree | 63dd536eb24e25eb2f2f863df2d532f0fc14fead /net/ipv4/ipmr.c | |
| parent | fe30021c36fbfb71d6ff25a424342149e58bba52 (diff) | |
| parent | 08e97aec700aeff54c4847f170e566cbd7e14e81 (diff) | |
| download | linux-1d4c79ed324ad780cfc3ad38364ba1fd585dd2a8.tar.gz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'net/ipv4/ipmr.c')
0 files changed, 0 insertions, 0 deletions