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 | e43327c706f28d9e66fc4242af4aefdd69e8ff24 (patch) | |
| tree | 797a6bafd7df88c351f1ffcee0bfa83ada95f7a2 /Makefile | |
| parent | dcc5c6f013d841e9ae74d527d312d512dfc2e2f0 (diff) | |
| parent | c195d66a8a75c60515819b101975f38b7ec6577f (diff) | |
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 'Makefile')
0 files changed, 0 insertions, 0 deletions