diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-24 07:33:28 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-24 07:33:28 +0200 |
commit | 91f5d14ede5cf81401453a2720c7b23a1a8b4f8a (patch) | |
tree | 470561de2e33976dac6379f6f4ddda73dfaf43ef /kernel-s390x.config | |
parent | 45dd5a73dba418c71e9465794add3dad980b43d6 (diff) | |
parent | f628f023e148da003cb42a393fefd254bda78add (diff) | |
download | kernel-91f5d14ede5cf81401453a2720c7b23a1a8b4f8a.tar.gz kernel-91f5d14ede5cf81401453a2720c7b23a1a8b4f8a.tar.xz kernel-91f5d14ede5cf81401453a2720c7b23a1a8b4f8a.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc0.git5.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc0.git5.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc0.git5.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc0.git5.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 1dcdb42f4..fe40ba006 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -891,6 +891,7 @@ CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m +CONFIG_CRYPTO_ESSIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_GCM=y @@ -1084,6 +1085,7 @@ CONFIG_DMARD10=m # CONFIG_DMATEST is not set CONFIG_DM_CACHE=m CONFIG_DM_CACHE_SMQ=m +# CONFIG_DM_CLONE is not set CONFIG_DM_CRYPT=m CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING=y # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set @@ -1108,6 +1110,7 @@ CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m +# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set CONFIG_DM_WRITECACHE=m CONFIG_DM_ZERO=y CONFIG_DM_ZONED=m @@ -2949,6 +2952,7 @@ CONFIG_MMC_VIA_SDMMC=m CONFIG_MMC_VUB300=m CONFIG_MMC_WBSD=m CONFIG_MMU=y +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS is not set # CONFIG_MODULE_FORCE_LOAD is not set # CONFIG_MODULE_FORCE_UNLOAD is not set @@ -3043,6 +3047,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y # CONFIG_MTD_NAND_HISI504 is not set # CONFIG_MTD_NAND_MESON is not set # CONFIG_MTD_NAND_MXC is not set +# CONFIG_MTD_NAND_MXIC is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_OMAP2 is not set # CONFIG_MTD_NAND_PLATFORM is not set |