diff --git a/Makefile.rhelver b/Makefile.rhelver
index 85efc4f..a8e2c98 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 = 19
+RHEL_RELEASE = 25
 
 #
 # Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index eaef7bf..8ebcdbd 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 34403ea..d2bf596 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 8979a8c..60cae73 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
@@ -1243,7 +1247,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1297,7 +1301,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5954,16 +5959,16 @@ CONFIG_UEFI_CPER_ARM=y
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 914d373..bba1b07 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 1e48e78..fb15033 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
@@ -1235,7 +1239,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1289,7 +1293,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5931,16 +5936,16 @@ CONFIG_UEFI_CPER_ARM=y
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index b465c86..884686a 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 948d654..228ea31 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 9ea79c3..de04fc4 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 47e15af..ad516fb 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 4ba5fa0..692c88e 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 8d03002..fa3eda9 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 c7b3f34..05bfd1c 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 56a8137..969a74d 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
@@ -1104,7 +1108,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1158,7 +1162,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5760,16 +5765,16 @@ CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 5984f3b..b8f6908 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 d020187..f5e8c79 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
@@ -1096,7 +1100,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1150,7 +1154,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5741,16 +5746,16 @@ CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 6b97ffb..9890eee 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 131c6f4..1449cea 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
@@ -1109,7 +1113,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1163,7 +1167,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5722,7 +5727,7 @@ CONFIG_UHID=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PCI_GENERIC is not set
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 69f8ffa..195517b 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 fd0ff1d..3842390 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
@@ -1101,7 +1105,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1155,7 +1159,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5703,7 +5708,7 @@ CONFIG_UHID=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PCI_GENERIC is not set
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 5606696..c65bc09 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
@@ -1111,7 +1114,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1165,7 +1168,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -5738,7 +5742,7 @@ CONFIG_UHID=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PCI_GENERIC is not set
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 2f562d3..90e95b3 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 72761a4..4a6a3c6 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
@@ -1176,7 +1186,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1236,7 +1246,7 @@ CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -4128,7 +4139,7 @@ CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 CONFIG_PINCTRL_ALDERLAKE=m
-CONFIG_PINCTRL_AMD=m
+CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CANNONLAKE=m
@@ -5995,17 +6006,17 @@ CONFIG_UDF_FS=m
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
 CONFIG_UID16=y
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e45837c..aab92a6 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 3e5d055..11d0152 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
@@ -1168,7 +1178,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1228,7 +1238,7 @@ CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -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
@@ -4109,7 +4120,7 @@ CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 CONFIG_PINCTRL_ALDERLAKE=m
-CONFIG_PINCTRL_AMD=m
+CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CANNONLAKE=m
@@ -5973,17 +5984,17 @@ CONFIG_UDF_FS=m
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
 CONFIG_UID16=y
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel.spec b/kernel.spec
index 091b8a0..2be4f3d 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,14 +59,21 @@
 
 Summary: The Linux kernel
 
-# For a kernel released for public testing, released_kernel should be 1.
-# For internal testing builds during development, it should be 0.
-# For rawhide and/or a kernel built from an rc or git snapshot,
-# released_kernel should be 0.
-# For a stable, released kernel, released_kernel should be 1.
+# Set released_kernel to 1 when the upstream source tarball contains a
+#  kernel release. (This includes prepatch or "rc" releases.)
+# Set released_kernel to 0 when the upstream source tarball contains an
+#  unreleased kernel development snapshot.
 %global released_kernel 0
 
-%global distro_build 0.rc2.19
+# Set debugbuildsenabled to 1 to build separate base and debug kernels
+#  (on supported architectures). The kernel-debug-* subpackages will
+#  contain the debug kernel.
+# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
+#  to build the base kernel using the debug configuration. (Specifying
+#  the --with-release option overrides this setting.)
+%define debugbuildsenabled 1
+
+%global distro_build 0.rc3.25
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -106,24 +113,23 @@ Summary: The Linux kernel
 %define primary_target rhel
 %endif
 
+# The kernel tarball/base version
+%define kversion 5.13
+
 %define rpmversion 5.13.0
-%define pkgrelease 0.rc2.19
+%define pkgrelease 0.rc3.25
 
 # This is needed to do merge window version magic
 %define patchlevel 13
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.19%{?buildid}%{?dist}
+%define specrelease 0.rc3.25%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
-# What parts do we want to build? These are the kernels that are built IF the
-# architecture allows it. All should default to 1 (enabled) and be flipped to
-# 0 (disabled) by later arch-specific checks.
-
-# The following build options are enabled by default.
-# Use either --without <opt> in your rpmbuild command or force values
-# to 0 in here to disable them.
+# The following build options are enabled by default, but may become disabled
+# by later architecture-specific checks. These can also be disabled by using
+# --without <opt> in the rpmbuild command, or by forcing these values to 0.
 #
 # standard kernel
 %define with_up        %{?_without_up:        0} %{?!_without_up:        1}
@@ -131,6 +137,8 @@ Summary: The Linux kernel
 %define with_pae       %{?_without_pae:       0} %{?!_without_pae:       1}
 # kernel-debug
 %define with_debug     %{?_without_debug:     0} %{?!_without_debug:     1}
+# kernel-zfcpdump (s390 specific kernel for zfcpdump)
+%define with_zfcpdump  %{?_without_zfcpdump:  0} %{?!_without_zfcpdump:  1}
 # kernel-doc
 %define with_doc       %{?_without_doc:       0} %{?!_without_doc:       1}
 # kernel-headers
@@ -144,10 +152,6 @@ Summary: The Linux kernel
 %define with_bpftool   %{?_without_bpftool:   0} %{?!_without_bpftool:   1}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
-# Control whether to install the vdso directories.
-%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
-# kernel-zfcpdump (s390 specific kernel for zfcpdump)
-%define with_zfcpdump  %{?_without_zfcpdump:  0} %{?!_without_zfcpdump:  1}
 # kernel-abi-whitelists
 %define with_kernel_abi_whitelists %{?_without_kernel_abi_whitelists: 0} %{?!_without_kernel_abi_whitelists: 1}
 # internal samples and selftests
@@ -173,6 +177,9 @@ Summary: The Linux kernel
 %define with_kabidwchk %{?_without_kabidwchk: 0} %{?!_without_kabidwchk: 1}
 %define with_kabidw_base %{?_with_kabidw_base: 1} %{?!_with_kabidw_base: 0}
 #
+# Control whether to install the vdso directories.
+%define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
+#
 # should we do C=1 builds with sparse
 %define with_sparse    %{?_with_sparse:       1} %{?!_with_sparse:       0}
 #
@@ -200,14 +207,6 @@ Summary: The Linux kernel
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
 
-# Set debugbuildsenabled to 1 for production (build separate debug kernels)
-#  and 0 for rawhide (all kernels are debug kernels).
-# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
-
-# The kernel tarball/base version
-%define kversion 5.13
-
 %if 0%{?fedora}
 # Kernel headers are being split out into a separate package
 %define with_headers 0
@@ -275,6 +274,10 @@ Summary: The Linux kernel
 %define nopatches 1
 %endif
 
+%if %{with_release}
+%define debugbuildsenabled 1
+%endif
+
 %if !%{debugbuildsenabled}
 %define with_debug 0
 %endif
@@ -542,6 +545,7 @@ BuildRequires: zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison
 BuildRequires: audit-libs-devel
 BuildRequires: java-devel
 BuildRequires: libbpf-devel
+BuildRequires: libbabeltrace-devel
 %ifnarch %{arm} s390x
 BuildRequires: numactl-devel
 %endif
@@ -619,7 +623,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13.0-0.rc2.19.tar.xz
+Source0: linux-5.13.0-0.rc3.25.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1039,9 +1043,9 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
 
 #
 # This macro creates a kernel-<subpackage>-devel package.
-#	%%kernel_devel_package <subpackage> <pretty-name>
+#	%%kernel_devel_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_devel_package() \
+%define kernel_devel_package(m) \
 %package %{?1:%{1}-}devel\
 Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
 Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
@@ -1058,6 +1062,9 @@ Requires: bison\
 Requires: flex\
 Requires: make\
 Requires: gcc\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-devel-uname-r = %{KVERREL}\
+%endif\
 %description %{?1:%{1}-}devel\
 This package provides kernel headers and makefiles sufficient to build modules\
 against the %{?2:%{2} }kernel package.\
@@ -1098,9 +1105,9 @@ This package provides kernel modules for the %{?2:%{2} }kernel package for Red H
 
 #
 # This macro creates a kernel-<subpackage>-modules-extra package.
-#	%%kernel_modules_extra_package <subpackage> <pretty-name>
+#	%%kernel_modules_extra_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_modules_extra_package() \
+%define kernel_modules_extra_package(m) \
 %package %{?1:%{1}-}modules-extra\
 Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
 Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\
@@ -1110,6 +1117,9 @@ Provides: installonlypkg(kernel-module)\
 Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-modules-extra-uname-r = %{KVERREL}\
+%endif\
 AutoReq: no\
 AutoProv: yes\
 %description %{?1:%{1}-}modules-extra\
@@ -1118,9 +1128,9 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne
 
 #
 # This macro creates a kernel-<subpackage>-modules package.
-#	%%kernel_modules_package <subpackage> <pretty-name>
+#	%%kernel_modules_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_modules_package() \
+%define kernel_modules_package(m) \
 %package %{?1:%{1}-}modules\
 Summary: kernel modules to match the %{?2:%{2}-}core kernel\
 Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
@@ -1129,6 +1139,9 @@ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
 Provides: installonlypkg(kernel-module)\
 Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-modules-uname-r = %{KVERREL}\
+%endif\
 AutoReq: no\
 AutoProv: yes\
 %description %{?1:%{1}-}modules\
@@ -1152,22 +1165,27 @@ The meta-package for the %{1} kernel\
 #
 # This macro creates a kernel-<subpackage> and its -devel and -debuginfo too.
 #	%%define variant_summary The Linux kernel compiled for <configuration>
-#	%%kernel_variant_package [-n <pretty-name>] <subpackage>
+#	%%kernel_variant_package [-n <pretty-name>] [-m] <subpackage>
 #
-%define kernel_variant_package(n:) \
+%define kernel_variant_package(n:m) \
 %package %{?1:%{1}-}core\
 Summary: %{variant_summary}\
 Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-core-uname-r = %{KVERREL}\
+%endif\
 %{expand:%%kernel_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
 %{expand:%%kernel_meta_package %{?1:%{1}}}\
 %endif\
-%{expand:%%kernel_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
+%{expand:%%kernel_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%if %{-m:0}%{!-m:1}\
 %{expand:%%kernel_modules_internal_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
 %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
+%endif\
 %{nil}
 
 # Now, each variant package.
@@ -1190,7 +1208,11 @@ zfcpdump infrastructure.
 %endif
 
 %define variant_summary The Linux kernel compiled with extra debugging enabled
+%if !%{debugbuildsenabled}
+%kernel_variant_package -m debug
+%else
 %kernel_variant_package debug
+%endif
 %description debug-core
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
@@ -1270,8 +1292,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.13.0-0.rc2.19 -c
-mv linux-5.13.0-0.rc2.19 linux-%{KVERREL}
+%setup -q -n kernel-5.13.0-0.rc3.25 -c
+mv linux-5.13.0-0.rc3.25 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2517,8 +2539,10 @@ fi\
 %kernel_variant_post -v lpae -r (kernel|kernel-smp)
 %endif
 
+%if %{with_debug}
 %kernel_variant_preun debug
 %kernel_variant_post -v debug
+%endif
 
 %if %{with_zfcpdump}
 %kernel_variant_preun zfcpdump
@@ -2743,6 +2767,13 @@ fi
 
 %kernel_variant_files %{_use_vdso} %{with_up}
 %kernel_variant_files %{_use_vdso} %{with_debug} debug
+%if !%{debugbuildsenabled}
+%files debug
+%files debug-core
+%files debug-devel
+%files debug-modules
+%files debug-modules-extra
+%endif
 %kernel_variant_files %{use_vdso} %{with_pae} lpae
 %kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
 
@@ -2764,8 +2795,27 @@ fi
 #
 #
 %changelog
+* Mon May 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.25]
+- v5.13-rc3 rebase
+- Override %%{debugbuildsenabled} if the --with-release option is used (David Ward)
+- Improve comments in SPEC file, and move some option tests and macros (David Ward)
+
+* 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)
+
+* Tue May 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210518git8ac91e6c6033.20]
+- UIO: disable unused config options (Aristeu Rozanski) [1957819]
+- ARK-config: Make amd_pinctrl module builtin (Hans de Goede)
+
 * Mon May 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.19]
-- v5.13-rc2 rebase
 - rpmspec: revert/drop content hash for kernel-headers (Herton R. Krzesinski)
 - rpmspec: fix check that calls InitBuildVars (Herton R. Krzesinski)
 
diff --git a/sources b/sources
index 1f8bd70..55b5fb7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13.0-0.rc2.19.tar.xz) = 368984f655e054704e150f9604541965f408c96ec8231545d9927b198e9cd8a115807cb8d9192271548aa0fa3ecb7ada0f468ccae11cdc540413cf9501a77084
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc2.19.tar.bz2) = 30155578a5894983888d33c42cc8d2c325395a6946ff11a2225eee629f33dacf896ed5afabda80582f6fe68141dbd9bbe3761b6dfb9de4b8dedc4122d4f5410e
-SHA512 (kernel-kabi-dw-5.13.0-0.rc2.19.tar.bz2) = f7898946c7eb82dbe2f8b37be602ded33f7a28f9554d3da9d52b7952e3b12c672b1c5214283bd04efbe59cb82addd552880ecd951340ddd6da8eda4e69e68627
+SHA512 (linux-5.13.0-0.rc3.25.tar.xz) = f3a3603de17346d23312007ec7792b0419a9022ab540f01de1cd568e9640fd6936697733a58bbd50d1631f0fc0eb8c08540cfb9eecbcad640a1bc2ca0deb90df
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.25.tar.bz2) = 6351d433840b94ba5675e120065160f0bd7fbe41b6aa526236622215376fb37d3158a8f4087fd0ba4f438642cabbebe0f9a142ce75bc0777493efe7ee927a58f
+SHA512 (kernel-kabi-dw-5.13.0-0.rc3.25.tar.bz2) = f1e76c4da76ad443e171b34c9d03b99c9cd1a5d9bf5a45aced8d8857db9897c8eb66100bc61c45ba01058f7d3f5a9d3b8763d21fe22f0013970480f9095f6383