diff --git a/Makefile.rhelver b/Makefile.rhelver
index 4e5e0114c..f4ad3f49d 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 = 38
+RHEL_RELEASE = 41
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 6fc71bece..63ff384a3 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -935,7 +935,7 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -5657,6 +5657,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 56daa7e5f..4663b8941 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -935,7 +935,7 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -5633,6 +5633,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index ecc64fb1c..97e18a2f2 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -6002,7 +6002,7 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-# CONFIG_SND_SOC_AMD_ACP6x is not set
+CONFIG_SND_SOC_AMD_ACP6x=m
 # CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
@@ -6010,7 +6010,7 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
@@ -6023,7 +6023,7 @@ CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
+CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -6118,7 +6118,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -6155,7 +6155,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
+CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index bea7f0258..34c9ab2a1 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5978,7 +5978,7 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-# CONFIG_SND_SOC_AMD_ACP6x is not set
+CONFIG_SND_SOC_AMD_ACP6x=m
 # CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
@@ -5986,7 +5986,7 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
@@ -5999,7 +5999,7 @@ CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
+CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -6094,7 +6094,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -6131,7 +6131,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
+CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index f22007e21..f2a3686ee 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -796,7 +796,7 @@ CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -5447,6 +5447,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 10b8cf2d7..c876154c5 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -796,7 +796,7 @@ CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -5427,6 +5427,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 9be4ac98c..95d3b9197 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -796,7 +796,7 @@ CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -5392,6 +5392,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 64b0f7a7e..288c0f79f 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -796,7 +796,7 @@ CONFIG_CRYPTO_AES_S390=m
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
@@ -5372,6 +5372,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index be87d943e..c8107c9a9 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -801,7 +801,7 @@ CONFIG_CRYPTO_AES_S390=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=y
 # CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=y
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLOWFISH=y
 CONFIG_CRYPTO_CAMELLIA=y
@@ -5394,6 +5394,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index fc30c2c2b..3ec9b67c2 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6052,7 +6052,7 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-# CONFIG_SND_SOC_AMD_ACP6x is not set
+CONFIG_SND_SOC_AMD_ACP6x=m
 # CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
@@ -6060,7 +6060,7 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
@@ -6073,7 +6073,7 @@ CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
+CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -6168,7 +6168,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -6205,7 +6205,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
+CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 7c21ad873..dbf3dc9df 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -827,7 +827,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLAKE2S_X86=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -5255,16 +5255,16 @@ CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
+CONFIG_SND_SOC_AMD_ACP6x=m
 # CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
+CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 # CONFIG_SND_SOC_BD28623 is not set
@@ -5276,7 +5276,7 @@ CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 # CONFIG_SND_SOC_CS35L35 is not set
 # CONFIG_SND_SOC_CS35L36 is not set
 # CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
+CONFIG_SND_SOC_CS35L41_SPI=m
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -5371,7 +5371,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -5408,7 +5408,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
+CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@@ -5609,6 +5609,7 @@ CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 5e97ef841..6e08f4ef3 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6028,7 +6028,7 @@ CONFIG_SND_SOC_AK5558=m
 # CONFIG_SND_SOC_ALC5623 is not set
 CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP5x=m
-# CONFIG_SND_SOC_AMD_ACP6x is not set
+CONFIG_SND_SOC_AMD_ACP6x=m
 # CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
@@ -6036,7 +6036,7 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
 CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
@@ -6049,7 +6049,7 @@ CONFIG_SND_SOC_CS35L34=m
 CONFIG_SND_SOC_CS35L35=m
 CONFIG_SND_SOC_CS35L36=m
 # CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
+CONFIG_SND_SOC_CS35L41_SPI=m
 CONFIG_SND_SOC_CS4234=m
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -6144,7 +6144,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -6181,7 +6181,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_NAU8315 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
+CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 53fee649c..5180b21c6 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -827,7 +827,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_AUTHENC=y
-# CONFIG_CRYPTO_BLAKE2B is not set
+CONFIG_CRYPTO_BLAKE2B=m
 # CONFIG_CRYPTO_BLAKE2S is not set
 CONFIG_CRYPTO_BLAKE2S_X86=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -5233,16 +5233,16 @@ CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_AMD_ACP3x is not set
 # CONFIG_SND_SOC_AMD_ACP5x is not set
-# CONFIG_SND_SOC_AMD_ACP6x is not set
+CONFIG_SND_SOC_AMD_ACP6x=m
 # CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
 # CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
 CONFIG_SND_SOC_AMD_RENOIR=m
 CONFIG_SND_SOC_AMD_RENOIR_MACH=m
-# CONFIG_SND_SOC_AMD_RV_RT5682_MACH is not set
-# CONFIG_SND_SOC_AMD_VANGOGH_MACH is not set
-# CONFIG_SND_SOC_AMD_YC_MACH is not set
+CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m
+CONFIG_SND_SOC_AMD_VANGOGH_MACH=m
+CONFIG_SND_SOC_AMD_YC_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_ARNDALE is not set
 # CONFIG_SND_SOC_BD28623 is not set
@@ -5254,7 +5254,7 @@ CONFIG_SND_SOC_AMD_RENOIR_MACH=m
 # CONFIG_SND_SOC_CS35L35 is not set
 # CONFIG_SND_SOC_CS35L36 is not set
 # CONFIG_SND_SOC_CS35L41_I2C is not set
-# CONFIG_SND_SOC_CS35L41_SPI is not set
+CONFIG_SND_SOC_CS35L41_SPI=m
 # CONFIG_SND_SOC_CS4234 is not set
 # CONFIG_SND_SOC_CS4265 is not set
 # CONFIG_SND_SOC_CS4270 is not set
@@ -5349,7 +5349,7 @@ CONFIG_SND_SOC_INTEL_SKYLAKE=m
 CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
 CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
@@ -5386,7 +5386,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
-# CONFIG_SND_SOC_NAU8821 is not set
+CONFIG_SND_SOC_NAU8821=m
 # CONFIG_SND_SOC_NAU8822 is not set
 CONFIG_SND_SOC_NAU8824=m
 CONFIG_SND_SOC_NAU8825=m
@@ -5586,6 +5586,7 @@ CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 # CONFIG_SND_SUN8I_CODEC_ANALOG is not set
 # CONFIG_SND_SUN8I_CODEC is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_TEST_COMPONENT is not set
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB_6FIRE=m
 CONFIG_SND_USB_AUDIO=m
diff --git a/kernel.spec b/kernel.spec
index 8d1ca16c9..2eda90c29 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux 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 0
+%define debugbuildsenabled 1
 
-%global distro_build 0.rc5.20211217git6441998e2e37.38
+%global distro_build 0.rc6.41
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc5.20211217git6441998e2e37.38
+%define pkgrelease 0.rc6.41
 
 # This is needed to do merge window version magic
 %define patchlevel 16
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20211217git6441998e2e37.38%{?buildid}%{?dist}
+%define specrelease 0.rc6.41%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -689,7 +689,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc5-171-g6441998e2e37.tar.xz
+Source0: linux-5.16-rc6.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1383,8 +1383,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16-rc5-171-g6441998e2e37 -c
-mv linux-5.16-rc5-171-g6441998e2e37 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc6 -c
+mv linux-5.16-rc6 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2981,6 +2981,9 @@ fi
 #
 #
 %changelog
+* Mon Dec 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.41]
+- redhat/configs: Enable CONFIG_CRYPTO_BLAKE2B (Neal Gompa) [2031547]
+
 * Thu Dec 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc5.20211216git2b14864acbaa.37]
 - Enable CONFIG_BPF_SYSCALL for zfcpdump (Jiri Olsa)
 
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index c28d96f4c..7d24b0f5a 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 765115c99655..a57d974abf71 100644
+index d85f1ff79f5c..3eca2a2b70de 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 36d39c6c4..8a3032ac7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc5-171-g6441998e2e37.tar.xz) = d5efd16f54ad9b90f010c4736800956ab7a1639a9b35195c8ee5fb0f63bc58eff1cf73358fef499da334fa32523a5669d6619a14d352149057219c904414aa82
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc5.20211217git6441998e2e37.38.tar.bz2) = e81190a7f7c4faefd69b4d67caa6dfe33401d585773b63695f3b0e75b77ecd7e74359de8a875be2c9be3256c9e95ce2afe7b2bf6e4d135086844e7f5f024f1b0
-SHA512 (kernel-kabi-dw-5.16.0-0.rc5.20211217git6441998e2e37.38.tar.bz2) = 3a2351e75e1791a972650152d29a759a269f871571f55015dc8abc21019f41295ea50e6d4dd994869b3962c1ad9542b96385244f9b8181f29814fa31be0bc602
+SHA512 (linux-5.16-rc6.tar.xz) = f3ede4eb27a8c53d6b67649bf5c3a2dd25b2b449d8554d6e16813d7a338e169c12c2d74f7073e7c1c491fe27de6445edf9275e84688dd23dc2c583f4eb502c00
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc6.41.tar.bz2) = fbc21ae38f80d2608c24a83e5b3f683f2c858b98bd824fb423f4d461329a8e77792fafec663cee778d9813122aa85f7041edb538ba6064b7c9122c3b58b8d76e
+SHA512 (kernel-kabi-dw-5.16.0-0.rc6.41.tar.bz2) = e99570e3ae1a2591dd30d92d41c459f554ba370645bd87e9d7bc320c493ca30cddc4bc8d014536336cccc998f6f094fc1ac16f1b532a8ff2ae43648dd195fd65