diff --git a/Makefile.rhelver b/Makefile.rhelver
index a5c12c1dd..2c3816673 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 = 30
+RHEL_RELEASE = 31
 
 #
 # ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 32fa6a5bf..52ff7bde4 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/4f1b65f0549b810c1419ae7d4b91664df4f89d30
- 4f1b65f0549b810c1419ae7d4b91664df4f89d30 kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e90e7b1c992140f8d072f1f7e7ef88648f6e416b
+ e90e7b1c992140f8d072f1f7e7ef88648f6e416b kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes
 
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/8d2cc85c7080506ecb798e46a48a3cdb89bbb175
  8d2cc85c7080506ecb798e46a48a3cdb89bbb175 redhat: version two of Makefile.rhelver tweaks
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 489744459..31471903c 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -5980,7 +5980,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -7324,7 +7323,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 2df19469b..7c5247b66 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -4673,7 +4673,6 @@ CONFIG_QUOTA_DEBUG=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 3e6299f04..717eed45b 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -5953,7 +5953,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -7296,7 +7295,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index bd6cc7d20..835a5ff39 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -4650,7 +4650,6 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 47fe81103..729e4dbbd 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -5953,7 +5953,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -7328,7 +7327,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index be7f81b32..bdc66314c 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -5928,7 +5928,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -7302,7 +7301,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 035011e8a..44a431ff2 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -5801,7 +5801,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -7138,7 +7137,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 56fb59f74..9182d98d1 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -5776,7 +5776,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -7112,7 +7111,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 282b5fc80..abb3bd136 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4970,7 +4970,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -6151,7 +6150,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 5d0afb176..2ac2381ca 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -255,7 +255,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -892,7 +891,6 @@ CONFIG_CRYPTO_CMAC=y
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -974,7 +972,6 @@ CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RSA=y
@@ -982,20 +979,14 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
 CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_SM3 is not set
 # CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4438,7 +4429,6 @@ CONFIG_QUOTA_DEBUG=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index e33871a83..1a0194f22 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4941,7 +4941,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -6121,7 +6120,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 737802bb5..3d66f422b 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -255,7 +255,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -892,7 +891,6 @@ CONFIG_CRYPTO_CMAC=y
 # CONFIG_CRYPTO_CRC32C_VPMSUM is not set
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -974,7 +972,6 @@ CONFIG_CRYPTO_OFB=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RSA=y
@@ -982,20 +979,14 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 # CONFIG_CRYPTO_SHA1_PPC is not set
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
 CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
 # CONFIG_CRYPTO_SM3_GENERIC is not set
 # CONFIG_CRYPTO_SM3 is not set
 # CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4417,7 +4408,6 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index ab32d8f9e..039956d4b 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4901,7 +4901,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -6092,7 +6091,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 685142aa5..0be65c741 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -254,7 +254,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -893,7 +892,6 @@ CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_S390=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -971,7 +969,6 @@ CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RSA=y
@@ -979,15 +976,11 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1_S390=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_S390=y
 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=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_S390=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
@@ -995,8 +988,6 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM3 is not set
 # CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4381,7 +4372,6 @@ CONFIG_QUOTA_DEBUG=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 80ff1bff7..8276d3085 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4872,7 +4872,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -6062,7 +6061,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 98959ce2e..948d69db5 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -254,7 +254,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -893,7 +892,6 @@ CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_S390=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -971,7 +969,6 @@ CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RSA=y
@@ -979,15 +976,11 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SHA1_S390=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_S390=y
 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=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_S390=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
@@ -995,8 +988,6 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM3 is not set
 # CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4360,7 +4351,6 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 97be285b4..beaf4b8ca 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -254,7 +254,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -898,7 +897,6 @@ CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32_S390=y
 CONFIG_CRYPTO_CRC32=y
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
@@ -976,7 +974,6 @@ CONFIG_CRYPTO_PAES_S390=m
 CONFIG_CRYPTO_PCBC=y
 CONFIG_CRYPTO_PCRYPT=y
 CONFIG_CRYPTO_POLY1305=y
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=y
 # CONFIG_CRYPTO_RSA is not set
@@ -984,15 +981,11 @@ CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_SERPENT=y
 CONFIG_CRYPTO_SHA1_S390=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_S390=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA3_256_S390=y
 CONFIG_CRYPTO_SHA3_512_S390=y
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
 CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_S390=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
@@ -1000,8 +993,6 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM3 is not set
 # CONFIG_CRYPTO_SM3_NEON is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4375,7 +4366,6 @@ CONFIG_QUOTACTL=y
 # CONFIG_QUOTA is not set
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 6e71f12b5..ba3926f3b 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5308,7 +5308,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -6526,7 +6525,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index c34edd9d0..72f67e321 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -277,7 +277,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -938,7 +937,6 @@ CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
@@ -1025,7 +1023,6 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_POLY1305_X86_64=y
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RSA=y
@@ -1036,13 +1033,9 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SHA1_SSSE3=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
 CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_SSSE3=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
@@ -1053,8 +1046,6 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4618,7 +4609,6 @@ CONFIG_QUOTA_DEBUG=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 2e75c3b30..2904ad2ff 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5280,7 +5280,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R6040=m
 CONFIG_R8169=m
-CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_RADIO_ADAPTERS=m
 CONFIG_RADIO_MAXIRADIO=m
@@ -6497,7 +6496,7 @@ CONFIG_SND_SOC_CS42L42=m
 # CONFIG_SND_SOC_CS42L52 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
 # CONFIG_SND_SOC_CS42L73 is not set
-# CONFIG_SND_SOC_CS42L83 is not set
+CONFIG_SND_SOC_CS42L83=m
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 CONFIG_SND_SOC_CS43130=m
 # CONFIG_SND_SOC_CS4341 is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 95789afe5..2ef826d44 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -277,7 +277,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_ERRATUM_2224489=y
 CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2645198=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
 CONFIG_ARM_CMN=m
 # CONFIG_ARM_MHU_V2 is not set
@@ -938,7 +937,6 @@ CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_CRC32_PCLMUL=m
-CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m
 CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
 # CONFIG_CRYPTO_CRCT10DIF_VPMSUM is not set
 CONFIG_CRYPTO_CRYPTD=y
@@ -1025,7 +1023,6 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_POLY1305_X86_64=y
-# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set
 # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RSA=y
@@ -1036,13 +1033,9 @@ CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
 CONFIG_CRYPTO_SHA1_SSSE3=y
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256_ARM64=m
 CONFIG_CRYPTO_SHA256_SSSE3=y
 CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA3_ARM64 is not set
 CONFIG_CRYPTO_SHA3=y
-CONFIG_CRYPTO_SHA512_ARM64_CE=m
-# CONFIG_CRYPTO_SHA512_ARM64 is not set
 CONFIG_CRYPTO_SHA512_SSSE3=y
 CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM2 is not set
@@ -1053,8 +1046,6 @@ CONFIG_CRYPTO_SHA512=y
 # CONFIG_CRYPTO_SM4_AESNI_AVX2_X86_64 is not set
 # CONFIG_CRYPTO_SM4_AESNI_AVX_X86_64 is not set
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
-# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_SM4_GENERIC is not set
 # CONFIG_CRYPTO_SM4 is not set
@@ -4596,7 +4587,6 @@ CONFIG_QUOTACTL=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_QUOTA=y
 CONFIG_R8169=m
-# CONFIG_R8188EU is not set
 # CONFIG_R8712U is not set
 CONFIG_RADIO_ADAPTERS=y
 # CONFIG_RADIO_MAXIRADIO is not set
diff --git a/kernel.spec b/kernel.spec
index 5782a630a..8a5ab54b0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -143,13 +143,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc3.30
+%define pkgrelease 0.rc3.20230322gita1effab7a3a3.31
 %define kversion 6
-%define tarfile_release 6.3-rc3
+%define tarfile_release 6.3-rc3-21-ga1effab7a3a3
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.30%{?buildid}%{?dist}
+%define specrelease 0.rc3.20230322gita1effab7a3a3.31%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0
 
@@ -1541,9 +1541,6 @@ ApplyOptionalPatch linux-kernel-test.patch
 chmod +x scripts/checkpatch.pl
 mv COPYING COPYING-%{version}-%{release}
 
-# This Prevents scripts/setlocalversion from mucking with our version numbers.
-touch .scmversion
-
 # Mangle /usr/bin/python shebangs to /usr/bin/python3
 # Mangle all Python shebangs to be Python 3 explicitly
 # -p preserves timestamps
@@ -3363,9 +3360,17 @@ fi
 #
 #
 %changelog
-* Mon Mar 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.30]
+* Wed Mar 22 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.a1effab7a3a3.31]
 - kasan, powerpc: Don't rename memintrinsics if compiler adds prefixes (Marco Elver)
 
+* Wed Mar 22 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.a1effab7a3a3.30]
+- arm64/configs: Put some arm64 configs in the right place (Mark Salter)
+- cleanup removed R8188EU config (Peter Robinson)
+- Make RHJOBS container friendly (Don Zickus)
+- Remove scmversion from kernel.spec.template (Don Zickus)
+- redhat/configs: Enable CONFIG_SND_SOC_CS42L83 (Neal Gompa)
+- Linux v6.3.0-0.rc3.a1effab7a3a3
+
 * Mon Mar 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc3.29]
 - Linux v6.3.0-0.rc3
 
diff --git a/sources b/sources
index 2af7ab8ea..b5895c376 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.3-rc3.tar.xz) = fcdff16ea1bde9092ea6cdd070f6c5f274b8c73704a6cba45e5d51cd9cff9bc6598db4b6fe1224f36d9b7e99a2e2eba69f991ddb91569eb42f9f315f803f5284
-SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = e4c45a5f8cd0d22df4a4a3626c3d9a826eeedf95b60dfd3b6df52136135bb9cc8111e034b0ffd61064e68e32a0c25af7d6ed3b3b588df310e81993d8c41d3d15
-SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 5ba073af6be5bd01a62bc91d587e73c0795e280bcd18f10314fb3ebcb8cea88c802658073161c2b10b0a75db142bae94961c7ed3c1f621c9c2a42af6d3328636
+SHA512 (linux-6.3-rc3-21-ga1effab7a3a3.tar.xz) = 5228fb67094c776fb4dea3f3aa80883ceb05e22463e6385dbc058df2b75a8810660340e00cecb6d8550de4876834707a0fa3e7364e1546af98c89252d5654689
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = b1980478979ed50f38baad5d1800303d7a4c1110f4f9f590474e0250e97544e9d7916e403be7c49f671d50be610ec3d1c0d53d400b3d2b27ad101321476b068b
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 9767fabd84949817524c903546b3748bed1ad915a1d8f6c8e3222cd5f59d0cc6cd3720996f14972bc115a803f170a4c345574fa82090cb9781d77e4fbe3f4ce1