diff --git a/Makefile.rhelver b/Makefile.rhelver
index 201747f5f..4a25b306b 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 39
+RHEL_RELEASE = 40
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index f72add176..e7c51f654 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -1261,7 +1261,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7830,7 +7829,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index afbda4b5e..e5a6d2b9e 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -1261,7 +1261,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7805,7 +7804,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config
index fdf2d42d5..aba853505 100644
--- a/kernel-aarch64-automotive-debug-rhel.config
+++ b/kernel-aarch64-automotive-debug-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AHCI_TEGRA is not set
 # CONFIG_AHCI_XGENE is not set
-CONFIG_AIO=y
+# CONFIG_AIO is not set
 CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
@@ -1342,7 +1342,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -4492,7 +4491,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=y
 CONFIG_NET_DEV_REFCNT_TRACKER=y
 CONFIG_NETDEVSIM=m
-CONFIG_NET_DROP_MONITOR=y
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # CONFIG_NET_EMATCH_CMP is not set
@@ -8564,7 +8563,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_XHCI_RCAR=m
 # CONFIG_USB_XHCI_TEGRA is not set
diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config
index e2650f264..b4a4684dd 100644
--- a/kernel-aarch64-automotive-rhel.config
+++ b/kernel-aarch64-automotive-rhel.config
@@ -204,7 +204,7 @@ CONFIG_AHCI_IMX=m
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AHCI_TEGRA is not set
 # CONFIG_AHCI_XGENE is not set
-CONFIG_AIO=y
+# CONFIG_AIO is not set
 CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
@@ -1342,7 +1342,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -4471,7 +4470,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=y
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 CONFIG_NETDEVSIM=m
-CONFIG_NET_DROP_MONITOR=y
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # CONFIG_NET_EMATCH_CMP is not set
@@ -8539,7 +8538,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_XHCI_RCAR=m
 # CONFIG_USB_XHCI_TEGRA is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 5fcd3ae6a..a28b84ec6 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1259,7 +1259,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7826,7 +7825,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 4794d8c01..f8fff6de6 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1259,7 +1259,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7801,7 +7800,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index cc91ee931..960c842e1 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -1260,7 +1260,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7875,7 +7874,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index e80d18dfb..1d1fb2c48 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -1260,7 +1260,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_ARM64_CE=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7850,7 +7849,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=y
 CONFIG_USB_XHCI_TEGRA=m
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 7e8c35ff9..5774bfd79 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1032,7 +1032,6 @@ CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7279,7 +7278,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index fe58330f5..080f7853a 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1032,7 +1032,6 @@ CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7256,7 +7255,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 8581d1dd5..57bd25735 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1027,7 +1027,7 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_S390=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
+CONFIG_CRYPTO_HMAC_S390=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7255,7 +7255,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index e8be8e818..09d5f902f 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1027,7 +1027,7 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_S390=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
+CONFIG_CRYPTO_HMAC_S390=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7232,7 +7232,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index ee729eb7f..dd137bc5f 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -7254,7 +7254,8 @@ CONFIG_USB_WDM=m
 # CONFIG_USB_XHCI_DBGCAP is not set
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config
index f2fc1db4d..568373ff3 100644
--- a/kernel-x86_64-automotive-debug-rhel.config
+++ b/kernel-x86_64-automotive-debug-rhel.config
@@ -212,7 +212,7 @@ CONFIG_AFS_FSCACHE=y
 # CONFIG_AHCI_DWC is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AHCI_XGENE is not set
-CONFIG_AIO=y
+# CONFIG_AIO is not set
 CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
@@ -1113,7 +1113,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -4218,7 +4217,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=y
 CONFIG_NET_DEV_REFCNT_TRACKER=y
 CONFIG_NETDEVSIM=m
-CONFIG_NET_DROP_MONITOR=y
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # CONFIG_NET_EMATCH_CMP is not set
@@ -7858,7 +7857,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=m
 # CONFIG_USB_XHCI_TEGRA is not set
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config
index 2e34e4e8a..7b5854ec8 100644
--- a/kernel-x86_64-automotive-rhel.config
+++ b/kernel-x86_64-automotive-rhel.config
@@ -212,7 +212,7 @@ CONFIG_AFS_FSCACHE=y
 # CONFIG_AHCI_DWC is not set
 # CONFIG_AHCI_QORIQ is not set
 # CONFIG_AHCI_XGENE is not set
-CONFIG_AIO=y
+# CONFIG_AIO is not set
 CONFIG_AIR_EN8811H_PHY=m
 # CONFIG_AIX_PARTITION is not set
 # CONFIG_AK09911 is not set
@@ -1113,7 +1113,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -4198,7 +4197,7 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=y
 # CONFIG_NET_DEV_REFCNT_TRACKER is not set
 CONFIG_NETDEVSIM=m
-CONFIG_NET_DROP_MONITOR=y
+# CONFIG_NET_DROP_MONITOR is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_NET_DSA_MV88E6XXX_PTP is not set
 # CONFIG_NET_EMATCH_CMP is not set
@@ -7834,7 +7833,8 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 CONFIG_USB_XHCI_PLATFORM=m
 # CONFIG_USB_XHCI_TEGRA is not set
 CONFIG_USB_XUSBATM=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index d36551c61..04d4e9d9c 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1084,7 +1084,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7602,7 +7601,8 @@ CONFIG_USB_WDM=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 8d3a10c45..eb4a8586a 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1084,7 +1084,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7578,7 +7577,8 @@ CONFIG_USB_WDM=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 904dfd272..a031032e4 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -1085,7 +1085,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7651,7 +7650,8 @@ CONFIG_USB_WDM=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 136b0d4d6..ce5bbb2ff 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -1085,7 +1085,6 @@ CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_HCTR2 is not set
-# CONFIG_CRYPTO_HMAC_S390 is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_JITTERENTROPY_MEMSIZE_1024 is not set
@@ -7627,7 +7626,8 @@ CONFIG_USB_WDM=m
 CONFIG_USB_XHCI_DBGCAP=y
 CONFIG_USB_XHCI_HCD=y
 # CONFIG_USB_XHCI_HISTB is not set
-# CONFIG_USB_XHCI_PCI_RENESAS is not set
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
 # CONFIG_USB_XHCI_PLATFORM is not set
 CONFIG_USB_XUSBATM=m
 CONFIG_USB=y
diff --git a/kernel.changelog b/kernel.changelog
index f2cc921ab..2e8910ae5 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,18 @@
+* Sun Jan 12 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-40.el10]
+- selftests: netfilter: Stabilize rpath.sh (Phil Sutter) [RHEL-71139]
+- redhat/configs: automotive: disable CONFIG_AIO (Davide Caratti) [RHEL-71905]
+- redhat/configs: enable CONFIG_USB_XHCI_PCI_RENESAS on RHEL (Desnes Nunes) [RHEL-73371]
+- RHEL: Set correct config option for CRYPTO_HMAC_S390 (Mete Durlu) [RHEL-24137]
+- redhat/configs: automotive: disable CONFIG_NET_DROP_MONITOR (Davide Caratti) [RHEL-70868]
+- qed: put cond_resched() in qed_dmae_operation_wait() (CKI Backport Bot) [RHEL-71560]
+- qed: allow the callee of qed_mcp_nvm_read() to sleep (CKI Backport Bot) [RHEL-71560]
+- qed: put cond_resched() in qed_grc_dump_ctx_data() (CKI Backport Bot) [RHEL-71560]
+- qed: make 'ethtool -d' 10 times faster (CKI Backport Bot) [RHEL-71560]
+- x86/sev: Convert shared memory back to private on kexec (Vitaly Kuznetsov) [RHEL-68482]
+- x86/mm: Refactor __set_clr_pte_enc() (Vitaly Kuznetsov) [RHEL-68482]
+- x86/boot: Skip video memory access in the decompressor for SEV-ES/SNP (Vitaly Kuznetsov) [RHEL-68482]
+Resolves: RHEL-24137, RHEL-68482, RHEL-70868, RHEL-71139, RHEL-71560, RHEL-71905, RHEL-73371
+
 * Thu Jan 09 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-39.el10]
 - platform/x86/intel/pmc: Disable C1 auto-demotion during suspend (Steve Best) [RHEL-66570]
 - platform/x86/intel/pmc: Refactor platform resume functions to use cnl_resume() (Steve Best) [RHEL-66570]
diff --git a/kernel.spec b/kernel.spec
index 01686d521..299c09b80 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -162,15 +162,15 @@ Summary: The Linux kernel
 %define specrpmversion 6.12.0
 %define specversion 6.12.0
 %define patchversion 6.12
-%define pkgrelease 39
+%define pkgrelease 40
 %define kversion 6
-%define tarfile_release 6.12.0-39.el10
+%define tarfile_release 6.12.0-40.el10
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 39%{?buildid}%{?dist}
+%define specrelease 40%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.0-39.el10
+%define kabiversion 6.12.0-40.el10
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -4300,6 +4300,20 @@ fi\
 #
 #
 %changelog
+* Sun Jan 12 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-40.el10]
+- selftests: netfilter: Stabilize rpath.sh (Phil Sutter) [RHEL-71139]
+- redhat/configs: automotive: disable CONFIG_AIO (Davide Caratti) [RHEL-71905]
+- redhat/configs: enable CONFIG_USB_XHCI_PCI_RENESAS on RHEL (Desnes Nunes) [RHEL-73371]
+- RHEL: Set correct config option for CRYPTO_HMAC_S390 (Mete Durlu) [RHEL-24137]
+- redhat/configs: automotive: disable CONFIG_NET_DROP_MONITOR (Davide Caratti) [RHEL-70868]
+- qed: put cond_resched() in qed_dmae_operation_wait() (CKI Backport Bot) [RHEL-71560]
+- qed: allow the callee of qed_mcp_nvm_read() to sleep (CKI Backport Bot) [RHEL-71560]
+- qed: put cond_resched() in qed_grc_dump_ctx_data() (CKI Backport Bot) [RHEL-71560]
+- qed: make 'ethtool -d' 10 times faster (CKI Backport Bot) [RHEL-71560]
+- x86/sev: Convert shared memory back to private on kexec (Vitaly Kuznetsov) [RHEL-68482]
+- x86/mm: Refactor __set_clr_pte_enc() (Vitaly Kuznetsov) [RHEL-68482]
+- x86/boot: Skip video memory access in the decompressor for SEV-ES/SNP (Vitaly Kuznetsov) [RHEL-68482]
+
 * Thu Jan 09 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-39.el10]
 - platform/x86/intel/pmc: Disable C1 auto-demotion during suspend (Steve Best) [RHEL-66570]
 - platform/x86/intel/pmc: Refactor platform resume functions to use cnl_resume() (Steve Best) [RHEL-66570]
diff --git a/sources b/sources
index 292c12650..0dfe24519 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
-SHA512 (linux-6.12.0-39.el10.tar.xz) = aeeb90e4b9a8846aa6c9aab85a764557242f403be1b3f5e9cab37d93f8e240e144982fb90761ad5e93a632d95f834cdf72fe7e1ef948e827139b09ba6d2315cc
-SHA512 (kernel-abi-stablelists-6.12.0-39.el10.tar.xz) = ee34461fa5e85bf11ed8e6356347d7cc254410b4735c0765ad016ed8cdc57bc5c18f95023a1eed9be6c560b9c32c10b7358890c3ca1208f72c0892ec62d3b8a7
-SHA512 (kernel-kabi-dw-6.12.0-39.el10.tar.xz) = 03529afc24efbf85103e291dfe87bcc049f126ed3e8632960e9ba4b6d373a9895df63b3d75b636c7f45451049474f12c9b8c03290b0501389d5183d370f72942
+SHA512 (linux-6.12.0-40.el10.tar.xz) = fd036f52c23fcf65974b100b54e2ddfdce9139d923058025216a338fe5952467f125d472cffaf451f8e23268839c373324ea7fd0e789af97aad7a80c0dd18265
+SHA512 (kernel-abi-stablelists-6.12.0-40.el10.tar.xz) = 50236d609f682e8af9e90dd453bb30ac3e859e3ccc26948bee0e17e33289441288127eeebc56712888d1345d8ae3d730e05e81444b41442a286a29dcd4a305e6
+SHA512 (kernel-kabi-dw-6.12.0-40.el10.tar.xz) = fded83376b56df7cb4c5e79cd53f35164980429fbd707954c3aca8e372ba226664c84cdf805ca3b14b994f16cd61ee9a47d16f2a5c5c88decdd59303a2231ffb