diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-09 09:53:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-02-09 09:53:56 -0800 |
| commit | 19c6f993a93d9b529dee17e25bc7a608bc71bea3 (patch) | |
| tree | 0f764a5ef70555aec6058535ced66069f4e8df35 | |
| parent | 7fdf5a84d5c550ebc16253f6623283e27d7e54ae (diff) | |
| parent | e51070c154f93988d9829ae2c099f0558b4ea737 (diff) | |
| download | linux-crypto-19c6f993a93d9b529dee17e25bc7a608bc71bea3.tar.gz linux-crypto-19c6f993a93d9b529dee17e25bc7a608bc71bea3.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 two regressions:
- Potential boot failure due to missing cryptomgr on initramfs
- Stack overflow in octeontx2"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: api - Move cryptomgr soft dependency into algapi
crypto: octeontx2 - Avoid stack variable overflow
| -rw-r--r-- | crypto/algapi.c | 1 | ||||
| -rw-r--r-- | crypto/api.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algapi.c b/crypto/algapi.c index a366cb3e..76fdaa16 100644 --- a/crypto/algapi.c +++ b/crypto/algapi.c @@ -1324,3 +1324,4 @@ module_exit(crypto_algapi_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Cryptographic algorithms API"); +MODULE_SOFTDEP("pre: cryptomgr"); diff --git a/crypto/api.c b/crypto/api.c index cf0869dd..7ddfe946 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -643,4 +643,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done); MODULE_DESCRIPTION("Cryptographic core API"); MODULE_LICENSE("GPL"); -MODULE_SOFTDEP("pre: cryptomgr"); |