diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-22 06:23:48 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-22 06:23:48 +0200 |
commit | 15a5c1947ba5e434aa4794dedb5993f960275177 (patch) | |
tree | 881f297746a797af91ab542d66c9aab84e712e48 /kernel-s390x-zfcpdump-rhel.config | |
parent | 31c3bf0db77127c3b75cc183596ea2a838319e8f (diff) | |
parent | 80fa87205c87b1e049f9b5713358f486474eec98 (diff) | |
download | kernel-15a5c1947ba5e434aa4794dedb5993f960275177.tar.gz kernel-15a5c1947ba5e434aa4794dedb5993f960275177.tar.xz kernel-15a5c1947ba5e434aa4794dedb5993f960275177.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc35kernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc34kernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc33kernel-5.13.0-0.rc2.20210521git79a106fc6585.22.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 822b5448e..c65bc0995 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -882,6 +882,7 @@ CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MD4=y # CONFIG_CRYPTO_MD5 is not set CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=y CONFIG_CRYPTO_PAES_S390=m CONFIG_CRYPTO_PCBC=y @@ -1068,6 +1069,7 @@ CONFIG_DLM=m # CONFIG_DMA_API_DEBUG is not set # CONFIG_DMA_API_DEBUG_SG is not set # CONFIG_DMABUF_DEBUG is not set +# CONFIG_DMABUF_HEAPS_CMA is not set CONFIG_DMABUF_HEAPS_SYSTEM=y CONFIG_DMABUF_HEAPS=y CONFIG_DMABUF_MOVE_NOTIFY=y @@ -1079,6 +1081,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set # CONFIG_DMA_MAP_BENCHMARK is not set +# CONFIG_DMA_PERNUMA_CMA is not set # CONFIG_DMARD09 is not set # CONFIG_DMARD10 is not set CONFIG_DMATEST=m @@ -1427,6 +1430,7 @@ CONFIG_EVM_ATTR_FSUUID=y CONFIG_EVM_LOAD_X509=y CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" CONFIG_EVM=y +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y |