diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 5911214e7..86df66076 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -810,13 +810,13 @@ CONFIG_BT_QCA=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -1179,7 +1179,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1345,7 +1345,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CUSE is not set
@@ -3304,7 +3304,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index eb749f63d..fe25b496c 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -813,10 +813,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -1179,7 +1179,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1345,7 +1345,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CUSE is not set
@@ -3286,7 +3286,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 7d7b09db5..a7b430a57 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -817,13 +817,13 @@ CONFIG_BT_QCA=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -1176,7 +1176,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1342,7 +1342,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CUSE is not set
@@ -3351,7 +3351,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 0c1f8ce6e..7de01847a 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -820,10 +820,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -1176,7 +1176,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1342,7 +1342,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CUSE is not set
@@ -3334,7 +3334,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 201851bb3..f3161ac35 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -795,13 +795,13 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -1147,7 +1147,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1312,7 +1312,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CUSE is not set
@@ -3279,7 +3279,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index ae974baad..766dce6ef 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -798,10 +798,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -1147,7 +1147,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1312,7 +1312,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 # CONFIG_CUSE is not set
@@ -3262,7 +3262,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index f3eef5180..df0a71a5f 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -655,13 +655,13 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -964,7 +964,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1093,7 +1093,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
@@ -3040,7 +3040,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 31f8eaa58..df558becb 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -657,10 +657,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -963,7 +963,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1092,7 +1092,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CS5535_CLOCK_EVENT_SRC=m
@@ -3021,7 +3021,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c40abbbf0..fe22919a9 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -592,13 +592,13 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -890,7 +890,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1011,7 +1011,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CUSE=m
@@ -2772,7 +2772,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 6c8b962be..f33b6cfd7 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -594,10 +594,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -889,7 +889,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1010,7 +1010,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CUSE=m
@@ -2753,7 +2753,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 613cdcfe9..d68992b61 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -596,13 +596,13 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -897,7 +897,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1016,7 +1016,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CTCM=m
@@ -2746,7 +2746,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 783e5d4e3..9d8c8faa0 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -598,10 +598,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 # CONFIG_BTT is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -896,7 +896,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 # CONFIG_CRYPTO_BLAKE2S_X86 is not set
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1015,7 +1015,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CTCM=m
@@ -2727,7 +2727,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 1702b40af..a3f4205dd 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -662,13 +662,13 @@ CONFIG_BT_MTKSDIO=m
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
-# CONFIG_BTRFS_ASSERT is not set
+CONFIG_BTRFS_ASSERT=y
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -980,7 +980,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLAKE2S_X86=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1128,7 +1128,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CUSE=m
@@ -3092,7 +3092,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index b3099e93e..ce5d53732 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -664,10 +664,10 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_ASSERT is not set
 # CONFIG_BTRFS_DEBUG is not set
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
-CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_REF_VERIFY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+CONFIG_BTRFS_FS=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BTT=y
 CONFIG_BUG_ON_DATA_CORRUPTION=y
@@ -979,7 +979,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_BLAKE2B=m
+CONFIG_CRYPTO_BLAKE2B=y
 CONFIG_CRYPTO_BLAKE2S=m
 CONFIG_CRYPTO_BLAKE2S_X86=m
 CONFIG_CRYPTO_BLKCIPHER=y
@@ -1127,7 +1127,7 @@ CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=y
-CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_XXHASH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_ZSTD=m
 CONFIG_CUSE=m
@@ -3073,7 +3073,7 @@ CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
 CONFIG_LIB80211=m
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS_CS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 CONFIG_LIBERTAS=m
diff --git a/kernel.spec b/kernel.spec
index a1b6e2d6c..7742e67f9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -30,7 +30,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc4.20200708gitdcde237b9b0e.1
+%global distro_build 0.rc4.20200709git0bddd227f3dc.1
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -69,13 +69,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.8.0
-%define pkgrelease 0.rc4.20200708gitdcde237b9b0e.1
+%define pkgrelease 0.rc4.20200709git0bddd227f3dc.1
 
 # This is needed to do merge window version magic
 %define patchlevel 8
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20200708gitdcde237b9b0e.1%{?buildid}%{?dist}
+%define specrelease 0.rc4.20200709git0bddd227f3dc.1%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -567,7 +567,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200708gitdcde237b9b0e.tar.xz
+Source0: linux-20200709git0bddd227f3dc.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1280,8 +1280,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20200708gitdcde237b9b0e -c
-mv linux-20200708gitdcde237b9b0e linux-%{KVERREL}
+%setup -q -n kernel-20200709git0bddd227f3dc -c
+mv linux-20200709git0bddd227f3dc linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2792,8 +2792,8 @@ fi
 #
 #
 %changelog
-* Wed Jul 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200708gitdcde237b9b0e.1]
-- dcde237b9b0e rebase
+* Thu Jul 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200709git0bddd227f3dc.1]
+- 0bddd227f3dc rebase
 - Updated changelog for the release based on v5.8-rc4 (Fedora Kernel Team)
 
 * Mon Jul 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.1]
diff --git a/sources b/sources
index 1fa1b1bd9..55f73499c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200708gitdcde237b9b0e.tar.xz) = f04d7659447705de100618b0e0a398d4296145d80f00dd5898bba5a29fd208d907c6460c0577ab732f753c450c4ce9006d57d2843f2462823cde26e7d9056952
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc4.20200708gitdcde237b9b0e.1.tar.bz2) = 6b8233818994e6bdf9ab1f75fb4fcfc3b1f6483927420888980cd2f3e0ab3097ab69d6853797b60a5f4dbe494e2442500256543e979ab0c738bf585a5ba653a6
-SHA512 (kernel-kabi-dw-5.8.0-0.rc4.20200708gitdcde237b9b0e.1.tar.bz2) = c638f9abe1bf7fb47a7bc7d2824612f48cdb008d25cd57fd02346b864b8c7f85b91640012be40f524fd6672ea1f525a84273e553c7251a2c3870ebec4175b004
+SHA512 (linux-20200709git0bddd227f3dc.tar.xz) = b7a823aadd4eebfd68bedf50857a76c040555887daf31dcfc08ba764b22447ee49d7167585d7f93d450636f5a373468cce29bbee2ee5bd17d142b807a9bbf986
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc4.20200709git0bddd227f3dc.1.tar.bz2) = 304af56a8ca13c1622f884b3b94cba0e5d9fae8fdfcf58444bb8e9874bf78a837f49da86d23598172671e23436a64aadf2066eb3ecc942a8772137bc84387343
+SHA512 (kernel-kabi-dw-5.8.0-0.rc4.20200709git0bddd227f3dc.1.tar.bz2) = 353fc0e5bdafb9fa8ff1d132f97fd194b718bb5cbfd5b97c6b5df2127aa2ce3147be861d5ec728f1372c2e3c8357e193f33b06a2c680dc642cd86589242504c1