diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-30 15:53:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-30 15:53:44 -0700 |
| commit | 8e8c9f9431eed0b5a026db016ca5a70c7b404ea7 (patch) | |
| tree | 53f20cac229fa1052649d4d826ce912c5a77da88 /crypto/algif_rng.c | |
| parent | ecba6441ac30016919d78edf077c2579ca4d4e89 (diff) | |
| parent | 113767ab58ba2b4430fa802ccafd7e4c04ae512b (diff) | |
| download | linux-crypto-8e8c9f9431eed0b5a026db016ca5a70c7b404ea7.tar.gz linux-crypto-8e8c9f9431eed0b5a026db016ca5a70c7b404ea7.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- fix regression in af_alg that affects iwd
- restore polling delay in qat
- fix double free in ingenic on error path
- fix potential build failure in sa2ul due to missing Kconfig dependency
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: af_alg - Work around empty control messages without MSG_MORE
crypto: sa2ul - add Kconfig selects to fix build error
crypto: ingenic - Drop kfree for memory allocated with devm_kzalloc
crypto: qat - add delay before polling mailbox
Diffstat (limited to 'crypto/algif_rng.c')
0 files changed, 0 insertions, 0 deletions