kernel-5.13.0-0.rc2.20210521git79a106fc6585.22

* Fri May 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210521git79a106fc6585.22]
- configs: enable CONFIG_EXFAT_FS (Pavel Reichl) [1943423]
- Revert s390x/zfcpdump part of a9d179c40281 and ecbfddd98621 (Vladis Dronov)
- Embed crypto algos, modes and templates needed in the FIPS mode (Vladis Dronov) [1947240]
- configs: Add and enable CONFIG_HYPERV_TESTING for debug kernels (Mohammed Gamal)
- mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos (David Hildenbrand) [1945002]
- configs: enable CONFIG_CMA on x86_64 in ARK (David Hildenbrand) [1945002]
Resolves: rhbz#1943423, rhbz#1945002, rhbz#1947240

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

28 files changed, 238 insertions, 142 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 165fd6828..b2504df4a 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 21
+RHEL_RELEASE = 22
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index eaef7bf0f..8ebcdbdd0 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,6 @@
+https://gitlab.com/cki-project/kernel-ark/-/commit/3b0b403f2c1261ea8e4ab576e5a44664a7abd12c
+ 3b0b403f2c1261ea8e4ab576e5a44664a7abd12c mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos
+
 https://gitlab.com/cki-project/kernel-ark/-/commit/42fcca9ea8f8acd6f561e9589f92462246e572ff
  42fcca9ea8f8acd6f561e9589f92462246e572ff Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled"
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 34403eac3..d2bf59612 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1266,7 +1266,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B_NEON=m
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S_ARM=m
@@ -1277,12 +1277,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1395,7 +1395,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1418,7 +1418,7 @@ CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 6cfc3fa39..60cae73e0 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -932,7 +932,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -941,12 +941,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM64_CE=m
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
@@ -1022,7 +1022,8 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1031,6 +1032,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -1041,7 +1043,7 @@ CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=m
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
@@ -1069,7 +1071,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1200,6 +1202,7 @@ CONFIG_DLCI_MAX=8
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMABUF_DEBUG=y
+# CONFIG_DMABUF_HEAPS_CMA is not set
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_MOVE_NOTIFY=y
@@ -1211,6 +1214,7 @@ CONFIG_DMADEVICES=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
@@ -1568,7 +1572,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 914d37333..bba1b07dd 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1266,7 +1266,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B_NEON=m
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S_ARM=m
@@ -1277,12 +1277,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1395,7 +1395,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1418,7 +1418,7 @@ CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA3_ARM64=m
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3c11e5da1..fb1503359 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -932,7 +932,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -941,12 +941,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM64_CE=m
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
@@ -1022,7 +1022,8 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1031,6 +1032,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -1041,7 +1043,7 @@ CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=m
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 # CONFIG_CRYPTO_SHA512_ARM64_CE is not set
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
@@ -1069,7 +1071,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1192,6 +1194,7 @@ CONFIG_DLCI_MAX=8
 # 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
@@ -1203,6 +1206,7 @@ CONFIG_DMADEVICES=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
@@ -1560,7 +1564,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index b465c8678..884686abd 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1265,7 +1265,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B_NEON=m
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S_ARM=m
@@ -1276,12 +1276,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1396,7 +1396,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305_ARM=m
@@ -1418,7 +1418,7 @@ CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 948d65438..228ea31fe 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1265,7 +1265,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B_NEON=m
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S_ARM=m
@@ -1276,12 +1276,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1396,7 +1396,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305_ARM=m
@@ -1418,7 +1418,7 @@ CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 9ea79c36e..de04fc4af 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1236,7 +1236,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B_NEON=m
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S_ARM=m
@@ -1247,12 +1247,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1366,7 +1366,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305_ARM=m
@@ -1388,7 +1388,7 @@ CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 47e15af65..ad516fbb7 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1236,7 +1236,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B_NEON=m
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S_ARM=m
@@ -1247,12 +1247,12 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20_NEON=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32_ARM_CE=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1366,7 +1366,7 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_NEON=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305_ARM=m
@@ -1388,7 +1388,7 @@ CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA256_ARM=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 4ba5fa018..692c88ea0 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1015,7 +1015,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1024,11 +1024,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1107,7 +1107,7 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1123,7 +1123,7 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM2=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 8d030029c..fa3eda9eb 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1014,7 +1014,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1023,11 +1023,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1106,7 +1106,7 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1122,7 +1122,7 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_586=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM2=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c7b3f3450..05bfd1cb4 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -962,7 +962,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -971,11 +971,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -1047,7 +1047,7 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1063,7 +1063,7 @@ CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM2=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index e21b84e95..969a74d88 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -792,7 +792,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -801,11 +801,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -879,7 +879,8 @@ CONFIG_CRYPTO_MD4=m
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -887,6 +888,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -896,7 +898,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
@@ -922,7 +924,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1061,6 +1063,7 @@ CONFIG_DLM=m
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMABUF_DEBUG=y
+# CONFIG_DMABUF_HEAPS_CMA is not set
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_MOVE_NOTIFY=y
@@ -1072,6 +1075,7 @@ CONFIG_DMADEVICES=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
@@ -1419,7 +1423,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 5984f3b51..b8f69086d 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -961,7 +961,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -970,11 +970,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -1046,7 +1046,7 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1062,7 +1062,7 @@ CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM2=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index d62b11e48..f5e8c79c1 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -792,7 +792,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -801,11 +801,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -879,7 +879,8 @@ CONFIG_CRYPTO_MD4=m
 # CONFIG_CRYPTO_MD5_PPC is not set
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -887,6 +888,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -896,7 +898,7 @@ CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
@@ -922,7 +924,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1053,6 +1055,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
@@ -1064,6 +1067,7 @@ CONFIG_DMADEVICES=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
@@ -1411,7 +1415,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 6b97ffbc0..9890eee7f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -969,7 +969,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -978,11 +978,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -1048,7 +1048,7 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
@@ -1068,7 +1068,7 @@ CONFIG_CRYPTO_SHA256_S390=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3_256_S390=m
 CONFIG_CRYPTO_SHA3_512_S390=m
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 697fcad2a..1449cea1c 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -794,7 +794,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -803,11 +803,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -877,7 +877,8 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
@@ -886,6 +887,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -898,7 +900,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3_256_S390=m
 CONFIG_CRYPTO_SHA3_512_S390=m
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_S390=m
@@ -925,7 +927,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1066,6 +1068,7 @@ CONFIG_DLM=m
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMABUF_DEBUG=y
+# CONFIG_DMABUF_HEAPS_CMA is not set
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_MOVE_NOTIFY=y
@@ -1077,6 +1080,7 @@ CONFIG_DMADEVICES_VDEBUG=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
@@ -1424,7 +1428,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPOLINE_AUTO=y
 # CONFIG_EXPOLINE_FULL is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 69f8ffa15..195517bba 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -968,7 +968,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -977,11 +977,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -1047,7 +1047,7 @@ CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
@@ -1067,7 +1067,7 @@ CONFIG_CRYPTO_SHA256_S390=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3_256_S390=m
 CONFIG_CRYPTO_SHA3_512_S390=m
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 589d2046d..38423903b 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -794,7 +794,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -803,11 +803,11 @@ CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
@@ -877,7 +877,8 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
@@ -886,6 +887,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -898,7 +900,7 @@ CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3_256_S390=m
 CONFIG_CRYPTO_SHA3_512_S390=m
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_S390=m
@@ -925,7 +927,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1058,6 +1060,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
@@ -1069,6 +1072,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
@@ -1416,7 +1420,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPOLINE_AUTO=y
 # CONFIG_EXPOLINE_FULL is not set
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
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 2f562d339..90e95b3ed 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1033,7 +1033,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLAKE2S_X86=m
@@ -1049,12 +1049,12 @@ CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1139,7 +1139,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1161,7 +1161,7 @@ CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 511f70ca5..4a6a3c6c7 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -710,11 +710,17 @@ CONFIG_CLS_U32_PERF=y
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SYSFS is not set
+CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
@@ -819,7 +825,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLAKE2S_X86=m
@@ -835,12 +841,12 @@ CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
@@ -927,7 +933,8 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -936,6 +943,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -951,7 +959,7 @@ CONFIG_CRYPTO_SHA256_MB=m
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_MB=m
@@ -982,7 +990,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1133,17 +1141,19 @@ CONFIG_DLM=m
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMABUF_DEBUG=y
+# CONFIG_DMABUF_HEAPS_CMA is not set
 CONFIG_DMABUF_HEAPS_SYSTEM=y
 CONFIG_DMABUF_HEAPS=y
 CONFIG_DMABUF_MOVE_NOTIFY=y
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 CONFIG_DMADEVICES_DEBUG=y
 CONFIG_DMADEVICES_VDEBUG=y
 CONFIG_DMADEVICES=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
@@ -1527,7 +1537,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
@@ -2036,7 +2047,7 @@ CONFIG_HYPERV_KEYBOARD=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_STORAGE=m
-# CONFIG_HYPERV_TESTING is not set
+CONFIG_HYPERV_TESTING=y
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_VSOCKETS=m
 CONFIG_HYSDN_CAPI=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e45837c87..aab92a6be 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1032,7 +1032,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLAKE2S_X86=m
@@ -1048,12 +1048,12 @@ CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C_VPMSUM=m
 CONFIG_CRYPTO_CRC32C=y
@@ -1138,7 +1138,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -1160,7 +1160,7 @@ CONFIG_CRYPTO_SHA1_SSSE3=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256_SSSE3=m
 CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_SSSE3=m
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SIMD=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 4493f9770..11d015233 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -710,11 +710,17 @@ CONFIG_CLS_U32_PERF=y
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
 # CONFIG_CM36651 is not set
+CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUGFS is not set
 # CONFIG_CMA_DEBUG is not set
-# CONFIG_CMA is not set
+CONFIG_CMA_SIZE_MBYTES=0
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 # CONFIG_CMA_SYSFS is not set
+CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
@@ -819,7 +825,7 @@ CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_ARC4 is not set
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_BLAKE2B is not set
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLAKE2S_X86=m
@@ -835,12 +841,12 @@ CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6_AVX_X86_64=m
 CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_CFB=y
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_CHACHA20_X86_64=m
-CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C_INTEL=m
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
@@ -927,7 +933,8 @@ CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_NHPOLY1305_AVX2=m
 CONFIG_CRYPTO_NHPOLY1305_SSE2=m
-CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
@@ -936,6 +943,7 @@ CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_SALSA20=m
 # CONFIG_CRYPTO_SEED is not set
 CONFIG_CRYPTO_SEQIV=y
@@ -951,7 +959,7 @@ CONFIG_CRYPTO_SHA256_MB=m
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA256=y
 # CONFIG_CRYPTO_SHA3_ARM64 is not set
-CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
 # CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_MB=m
@@ -982,7 +990,7 @@ CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_XTS=y
 CONFIG_CRYPTO_XXHASH=m
 CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_ZSTD is not set
@@ -1125,17 +1133,19 @@ 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
 # CONFIG_DMABUF_SELFTESTS is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=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
@@ -1519,7 +1529,8 @@ CONFIG_EVM_ATTR_FSUUID=y
 CONFIG_EVM_LOAD_X509=y
 CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der"
 CONFIG_EVM=y
-# CONFIG_EXFAT_FS is not set
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_EXFAT_FS=m
 # CONFIG_EXPERT is not set
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_EXPORTFS=y
diff --git a/kernel.spec b/kernel.spec
index 3faedce83..bfd1565da 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc2.20210520gitc3d0e3fd41b7.21
+%global distro_build 0.rc2.20210521git79a106fc6585.22
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.13.0
-%define pkgrelease 0.rc2.20210520gitc3d0e3fd41b7.21
+%define pkgrelease 0.rc2.20210521git79a106fc6585.22
 
 # This is needed to do merge window version magic
 %define patchlevel 13
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20210520gitc3d0e3fd41b7.21%{?buildid}%{?dist}
+%define specrelease 0.rc2.20210521git79a106fc6585.22%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -620,7 +620,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc2-8-gc3d0e3fd41b7.tar.xz
+Source0: linux-5.13-rc2-191-g79a106fc6585.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1289,8 +1289,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.13-rc2-8-gc3d0e3fd41b7 -c
-mv linux-5.13-rc2-8-gc3d0e3fd41b7 linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc2-191-g79a106fc6585 -c
+mv linux-5.13-rc2-191-g79a106fc6585 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2792,6 +2792,14 @@ fi
 #
 #
 %changelog
+* Fri May 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210521git79a106fc6585.22]
+- configs: enable CONFIG_EXFAT_FS (Pavel Reichl) [1943423]
+- Revert s390x/zfcpdump part of a9d179c40281 and ecbfddd98621 (Vladis Dronov)
+- Embed crypto algos, modes and templates needed in the FIPS mode (Vladis Dronov) [1947240]
+- configs: Add and enable CONFIG_HYPERV_TESTING for debug kernels (Mohammed Gamal)
+- mm/cma: mark CMA on x86_64 tech preview and print RHEL-specific infos (David Hildenbrand) [1945002]
+- configs: enable CONFIG_CMA on x86_64 in ARK (David Hildenbrand) [1945002]
+
 * Thu May 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210520gitc3d0e3fd41b7.21]
 - rpmspec: build debug-* meta-packages if debug builds are disabled (Herton R. Krzesinski)
 
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch
index e0e027477..bb621aef6 100644
--- a/patch-5.13.0-redhat.patch
+++ b/patch-5.13.0-redhat.patch
@@ -60,13 +60,14 @@
  kernel/module_signing.c                            |   9 +-
  kernel/panic.c                                     |  14 +
  kernel/rh_taint.c                                  |  93 +++++++
+ mm/cma.c                                           |  10 +
  scripts/mod/modpost.c                              |   8 +
  scripts/tags.sh                                    |   2 +
  security/integrity/platform_certs/load_uefi.c      |   6 +-
  security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
- 68 files changed, 1197 insertions(+), 187 deletions(-)
+ 69 files changed, 1207 insertions(+), 187 deletions(-)
 
 diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
 index 75a9dd98e76e..3ff3291551f9 100644
@@ -2610,6 +2611,34 @@ index 000000000000..4050b6dead75
 +	        name ? name : "kernel");
 +}
 +EXPORT_SYMBOL(mark_driver_unsupported);
+diff --git a/mm/cma.c b/mm/cma.c
+index 995e15480937..588f7e7885cf 100644
+--- a/mm/cma.c
++++ b/mm/cma.c
+@@ -125,6 +125,12 @@ static void __init cma_activate_area(struct cma *cma)
+ 	spin_lock_init(&cma->mem_head_lock);
+ #endif
+
++#ifdef CONFIG_RHEL_DIFFERENCES
++	/* s390x and ppc64 has been using CMA already in RHEL 8 as default. */
++	if (!IS_ENABLED(CONFIG_S390) && !IS_ENABLED(CONFIG_PPC64))
++		mark_tech_preview("CMA", NULL);
++#endif /* CONFIG_RHEL_DIFFERENCES */
++
+ 	return;
+
+ not_in_zone:
+@@ -437,6 +443,10 @@ struct page *cma_alloc(struct cma *cma, unsigned long count,
+ 	if (!cma || !cma->count || !cma->bitmap)
+ 		goto out;
+
++#ifdef CONFIG_RHEL_DIFFERENCES
++	pr_info_once("Initial CMA usage detected\n");
++#endif /* CONFIG_RHEL_DIFFERENCES */
++
+ 	pr_debug("%s(cma %p, count %lu, align %d)\n", __func__, (void *)cma,
+ 		 count, align);
+
 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
 index 3e623ccc020b..3047abc9a507 100644
 --- a/scripts/mod/modpost.c
diff --git a/sources b/sources
index d02287451..55ac4b421 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13-rc2-8-gc3d0e3fd41b7.tar.xz) = 6a00084dd13a0c4a80dc13f927486604eba9f37f6dfdd42e218841ffcab96a5c4e14769f6312fbf4c624be7e100531da0f8abcbe7689316ab972c3311bf85daa
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc2.20210520gitc3d0e3fd41b7.21.tar.bz2) = c6a5a0ab34b1a37ba631bd24aa0039690ce4b4b659d34a727f572d9a4c188e0d64c72a0b9550761069b4997e2ad600f464bcb3915a5fca1eb4fbfffa12a4f65d
-SHA512 (kernel-kabi-dw-5.13.0-0.rc2.20210520gitc3d0e3fd41b7.21.tar.bz2) = c66bb005a89cff9f245947af245546cd36008386eec3bfaaf51cc9117b1062009e68686fa2af90e9b2f24da0072cb1a4fad93afa0d3d54cde7df72ce9c0a2941
+SHA512 (linux-5.13-rc2-191-g79a106fc6585.tar.xz) = ac52e8a728f297a67baba67832541b510a926fa73554c3b9c549020dc9f957da6dbdb82d88ceae7d24e9d1bfcbee02c12daf461e6dbcd487f07cedf27f718d65
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc2.20210521git79a106fc6585.22.tar.bz2) = 2d663943edff5268cbc95f436cf5d1b5be819ceb827e395f5a61d9e83ac940da41bd861f0a64d372c0a888a5a58f430b4e53d17eea1ff90fa1bfe0594ffcc04f
+SHA512 (kernel-kabi-dw-5.13.0-0.rc2.20210521git79a106fc6585.22.tar.bz2) = 41ace74800cbc7b088cee86fd19d4e39daa5e3d1e39fa85ac245134fc9b32490ec05975751b10fa39abe025c1eb30a2f81d024e6cff2fb2c8d84bec5f01b04ad