diff --git a/Makefile.rhelver b/Makefile.rhelver
index cb2beaa85..7db7c7804 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 = 17
+RHEL_RELEASE = 18
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config
index c5bf1af84..de6ca90ca 100644
--- a/kernel-aarch64-16k-debug-fedora.config
+++ b/kernel-aarch64-16k-debug-fedora.config
@@ -6999,6 +6999,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config
index fcf077872..3776f07bc 100644
--- a/kernel-aarch64-16k-fedora.config
+++ b/kernel-aarch64-16k-fedora.config
@@ -6972,6 +6972,7 @@ CONFIG_RTW89_8922AE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index fb37f8275..32381959e 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -1215,7 +1215,7 @@ CONFIG_CRYPTO_DEV_SA2UL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5628,6 +5628,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 283bc6563..eaa2b92ca 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -1215,7 +1215,7 @@ CONFIG_CRYPTO_DEV_SA2UL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5605,6 +5605,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 33b39a1cb..abe28894e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6998,6 +6998,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index aeed3ff9b..c361a3def 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1213,7 +1213,7 @@ CONFIG_CRYPTO_DEV_SA2UL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5624,6 +5624,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 827e67d65..4c33e959e 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6971,6 +6971,7 @@ CONFIG_RTW89_8922AE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index d28110594..d18876e46 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1213,7 +1213,7 @@ CONFIG_CRYPTO_DEV_SA2UL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5601,6 +5601,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index b09951d98..25aa9119b 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -1214,7 +1214,7 @@ CONFIG_CRYPTO_DEV_SA2UL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -3488,7 +3488,7 @@ CONFIG_LLC=m
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=16
+CONFIG_LOCKDEP_BITS=17
 CONFIG_LOCKDEP_CHAINS_BITS=18
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
@@ -5671,6 +5671,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 638d33bf3..52a021eec 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -1214,7 +1214,7 @@ CONFIG_CRYPTO_DEV_SA2UL=m
 # CONFIG_CRYPTO_DEV_SAHARA is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
+CONFIG_CRYPTO_DEV_TEGRA=m
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5648,6 +5648,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 4b6ddb4f3..dfa2db2b9 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -5695,6 +5695,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index be2cb58e8..dd59173f0 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -998,7 +998,6 @@ CONFIG_CRYPTO_DEV_NX=y
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
@@ -5166,6 +5165,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 34e7c3bf0..c618e3b28 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -5666,6 +5666,7 @@ CONFIG_RTW89_8922AE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 917e733a6..d72354ef2 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -998,7 +998,6 @@ CONFIG_CRYPTO_DEV_NX=y
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
@@ -5145,6 +5144,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index e300e1ab9..d96b36103 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -5615,6 +5615,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 9a0d6a042..99ee642d2 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -994,7 +994,6 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5098,6 +5097,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 0ea95b134..3334c9aa1 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -5586,6 +5586,7 @@ CONFIG_RTW89_8922AE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index abde5188d..39df26cae 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -994,7 +994,6 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5077,6 +5076,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 93f347987..42982f031 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -995,7 +995,6 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5090,6 +5089,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 0024e33c4..fe9eb329c 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6113,6 +6113,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 0c6885334..ebf76d86a 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1047,7 +1047,6 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5382,6 +5381,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 7c18ec054..83ca514b0 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6085,6 +6085,7 @@ CONFIG_RTW89_8922AE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 056b7f911..8f3b6065f 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1047,7 +1047,6 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5360,6 +5359,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index c7b9b6ea1..ac334b5b4 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -1048,7 +1048,6 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -3367,7 +3366,7 @@ CONFIG_LLC=m
 CONFIG_LOAD_UEFI_KEYS=y
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_LOCKDEP_BITS=16
+CONFIG_LOCKDEP_BITS=17
 CONFIG_LOCKDEP_CHAINS_BITS=18
 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12
 CONFIG_LOCKDEP_STACK_TRACE_BITS=19
@@ -5429,6 +5428,7 @@ CONFIG_RTW89_DEBUGFS=y
 CONFIG_RTW89_DEBUGMSG=y
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 64bd463d9..8145bf5a8 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -1048,7 +1048,6 @@ CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 # CONFIG_CRYPTO_DEV_SAFEXCEL is not set
 CONFIG_CRYPTO_DEV_SP_CCP=y
 CONFIG_CRYPTO_DEV_SP_PSP=y
-# CONFIG_CRYPTO_DEV_TEGRA is not set
 # CONFIG_CRYPTO_DEV_VIRTIO is not set
 CONFIG_CRYPTO_DH_RFC7919_GROUPS=y
 CONFIG_CRYPTO_DH=y
@@ -5407,6 +5406,7 @@ CONFIG_RTW89_8852CE=m
 # CONFIG_RTW89_DEBUGMSG is not set
 CONFIG_RTW89=m
 CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_RUST is not set
 CONFIG_RV_MON_WWNR=y
 CONFIG_RV_REACTORS=y
 CONFIG_RV_REACT_PANIC=y
diff --git a/kernel.changelog b/kernel.changelog
index 741f5cd6f..afd1c82e8 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,7 +1,17 @@
-* Tue Jul 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.94ede2a3e913.17]
+* Wed Jul 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.e4fc196f5ba3.18]
 - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
 Resolves: 
 
+* Wed Jul 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.e4fc196f5ba3.17]
+- arm64: enable CRYPTO_DEV_TEGRA on RHEL (Peter Robinson)
+- redhat/kernel.spec: fix file listed twice warning for "kernel" subdir (Jan Stancek)
+- redhat/configs: Double MAX_LOCKDEP_ENTRIES for RT debug kernels (Waiman Long) [RHEL-43425]
+- Support the first day after a rebase (Don Zickus)
+- Support 2 digit versions properly (Don Zickus)
+- Automation cleanups for rebasing rt-devel and automotive-devel (Don Zickus)
+- Linux v6.11.0-0.rc1.e4fc196f5ba3
+Resolves: RHEL-43425
+
 * Tue Jul 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.94ede2a3e913.16]
 - Linux v6.11.0-0.rc1.94ede2a3e913
 Resolves: 
diff --git a/kernel.spec b/kernel.spec
index 3ac4e1846..032ec88d1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -163,13 +163,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.11.0
 %define specversion 6.11.0
 %define patchversion 6.11
-%define pkgrelease 0.rc1.20240730git94ede2a3e913.17
+%define pkgrelease 0.rc1.20240731gite4fc196f5ba3.18
 %define kversion 6
-%define tarfile_release 6.11-rc1-43-g94ede2a3e913
+%define tarfile_release 6.11-rc1-62-ge4fc196f5ba3
 # This is needed to do merge window version magic
 %define patchlevel 11
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20240730git94ede2a3e913.17%{?buildid}%{?dist}
+%define specrelease 0.rc1.20240731gite4fc196f5ba3.18%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.11.0
 
@@ -2696,7 +2696,10 @@ BuildKernel() {
         sed -i %{?zipsed} $absolute_file_list
 %endif
         # add also dir for the case when there are no kmods
-        echo "%dir /lib/modules/$KernelVer/$module_subdir" >> $absolute_file_list
+        # "kernel" subdir is covered in %files section, skip it here
+        if [ "$module_subdir" != "kernel" ]; then
+                echo "%dir /lib/modules/$KernelVer/$module_subdir" >> $absolute_file_list
+        fi
 
         if [ "$add_all_dirs" -eq 1 ]; then
             (cd $RPM_BUILD_ROOT; find lib/modules/$KernelVer/kernel -mindepth 1 -type d | sort -n) > ../module-dirs.list
@@ -4043,9 +4046,18 @@ fi\
 #
 #
 %changelog
-* Tue Jul 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.94ede2a3e913.17]
+* Wed Jul 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.e4fc196f5ba3.18]
 - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert)
 
+* Wed Jul 31 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.e4fc196f5ba3.17]
+- arm64: enable CRYPTO_DEV_TEGRA on RHEL (Peter Robinson)
+- redhat/kernel.spec: fix file listed twice warning for "kernel" subdir (Jan Stancek)
+- redhat/configs: Double MAX_LOCKDEP_ENTRIES for RT debug kernels (Waiman Long) [RHEL-43425]
+- Support the first day after a rebase (Don Zickus)
+- Support 2 digit versions properly (Don Zickus)
+- Automation cleanups for rebasing rt-devel and automotive-devel (Don Zickus)
+- Linux v6.11.0-0.rc1.e4fc196f5ba3
+
 * Tue Jul 30 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.11.0-0.rc1.94ede2a3e913.16]
 - Linux v6.11.0-0.rc1.94ede2a3e913
 
diff --git a/sources b/sources
index e835a5d04..34526c88b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.11-rc1-43-g94ede2a3e913.tar.xz) = 3431b4a5373cefe3d7d7f6601ad50dd15f5e9517dd5a1facf488286ff34db6cd15ab1bc0d189739dd9c6b1041d61a71ff297d45416d44510976903af503a93ab
-SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 9075812ddb3d918221a09f22bd6368338e5cbfd45e35560fac7a1f1c826fbace7630ea69748bdfd5b874c2b585cc5b076dd9b91b1d17819c0870f496991a6a1f
-SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b9b9c336b1966d5f25596f9d09ce98985529121b9cc5e799c168a43d9894a01809424381aac12b1e0c282ca71c74879933049bab0fbb52109a662b26f912fe1a
+SHA512 (linux-6.11-rc1-62-ge4fc196f5ba3.tar.xz) = 71e13183dae3f508a1221e87d3070ebf8c9254a3a607216ee2fb899545fcf036ca77afe3ac955f38c0bf3d395b55fcea9ed1115423f1294dde56bb9b8fbad344
+SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 98ba264826e20dd91429ce3c0e2a8865822068d23e2c271f4e6e2c694b3378c65c22506295589b55f7bcefa752fa1b8a1dfe10c638c0d01ee09884d0dda15fa2
+SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = ec6c6e9ecad0d6f1512cb705dc28cad08436dc000fb7b80f877e010c3fe57cd644012a21be3bf240d1efcab388a957817b567a026386ed5146196b7280e51c4d