diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-09-25 11:15:38 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-09-25 11:16:58 -0400 |
| commit | e83c465ae14844b2dfff55178b82eeaccbef0b24 (patch) | |
| tree | 9ba289bdd8831b061743a8d48b13e6128306b8f1 /crypto/Kconfig | |
| parent | f960b5ebd9ed09bc12e10c712bce82ab58ef0435 (diff) | |
| parent | 508f8d23a372beae647185ce896a0c1109406b83 (diff) | |
| download | linux-crypto-e83c465ae14844b2dfff55178b82eeaccbef0b24.tar.gz linux-crypto-e83c465ae14844b2dfff55178b82eeaccbef0b24.zip | |
Merge tag 'v4.14-rc2' into k.o/for-next
Merge my for-next branch to Linux 4.14-rc2 and open up the for-next area
for 4.15 kernel development.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index caa770e5..0a121f9d 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -1753,6 +1753,8 @@ config CRYPTO_USER_API_AEAD tristate "User-space interface for AEAD cipher algorithms" depends on NET select CRYPTO_AEAD + select CRYPTO_BLKCIPHER + select CRYPTO_NULL select CRYPTO_USER_API help This option enables the user-spaces interface for AEAD |