diff --git a/.gitignore b/.gitignore
index 1c2aaf3..d7b5844 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 SOURCES/fedoraimaca.x509
-SOURCES/kernel-abi-stablelists-6.12.0-33.el10.tar.xz
-SOURCES/kernel-kabi-dw-6.12.0-33.el10.tar.xz
-SOURCES/linux-6.12.0-33.el10.tar.xz
+SOURCES/kernel-abi-stablelists-6.12.0-36.el10.tar.xz
+SOURCES/kernel-kabi-dw-6.12.0-36.el10.tar.xz
+SOURCES/linux-6.12.0-36.el10.tar.xz
 SOURCES/nvidiagpuoot001.x509
 SOURCES/redhatsecureboot501.cer
 SOURCES/redhatsecurebootca5.cer
diff --git a/.kernel.metadata b/.kernel.metadata
index 56b4471..7c7091a 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,7 +1,7 @@
 9b16961bd5da2dc805f1b73414c201d4371613f1 SOURCES/fedoraimaca.x509
-81047a904fb4784c600cfcad5a0623cb74953e24 SOURCES/kernel-abi-stablelists-6.12.0-33.el10.tar.xz
-d31d07ef9b7cbd77a6a43fb713d3cd755dc448ac SOURCES/kernel-kabi-dw-6.12.0-33.el10.tar.xz
-868f4d67bf86af7a81ec75502fa678096cdf7c6c SOURCES/linux-6.12.0-33.el10.tar.xz
+ba3f2a3197773cd296701969dc2f135a6560711e SOURCES/kernel-abi-stablelists-6.12.0-36.el10.tar.xz
+72ee4cd91d93d623c88660ff68bbdce66547b9a4 SOURCES/kernel-kabi-dw-6.12.0-36.el10.tar.xz
+34270ef980f685bb61a91c2dab6674144c11d62d SOURCES/linux-6.12.0-36.el10.tar.xz
 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509
 ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
 e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer
diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver
index 7809702..61b5cf3 100644
--- a/SOURCES/Makefile.rhelver
+++ b/SOURCES/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 33
+RHEL_RELEASE = 36
 
 #
 # RHEL_REBASE_NUM
diff --git a/SOURCES/gating.yaml b/SOURCES/gating.yaml
index 305f437..a263765 100644
--- a/SOURCES/gating.yaml
+++ b/SOURCES/gating.yaml
@@ -11,4 +11,3 @@ rules:
   - !PassingTestCaseRule {test_case_name: s1-aws-ci_aarch64.brew-build.tier1.functional}
   - !PassingTestCaseRule {test_case_name: s1-azure-ci_x86_64.brew-build.tier1.functional}
   - !PassingTestCaseRule {test_case_name: s1-azure-ci_aarch64.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: s1-gcp-ci.brew-build.tier1.functional}
diff --git a/SOURCES/kernel-aarch64-64k-debug-rhel.config b/SOURCES/kernel-aarch64-64k-debug-rhel.config
index 7cab7e4..ba326ef 100644
--- a/SOURCES/kernel-aarch64-64k-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-64k-debug-rhel.config
@@ -798,7 +798,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2563,7 +2563,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
@@ -4167,7 +4167,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-aarch64-64k-rhel.config b/SOURCES/kernel-aarch64-64k-rhel.config
index 098552a..5950e9c 100644
--- a/SOURCES/kernel-aarch64-64k-rhel.config
+++ b/SOURCES/kernel-aarch64-64k-rhel.config
@@ -798,7 +798,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2547,7 +2547,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
@@ -4146,7 +4146,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-aarch64-automotive-debug-rhel.config b/SOURCES/kernel-aarch64-automotive-debug-rhel.config
index 47d217c..da1e01c 100644
--- a/SOURCES/kernel-aarch64-automotive-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-automotive-debug-rhel.config
@@ -852,7 +852,7 @@ CONFIG_BT=m
 # CONFIG_BTRFS_FS is not set
 # CONFIG_BT_RTL is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 CONFIG_BT_VIRTIO=m
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2731,7 +2731,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 # CONFIG_HP_WATCHDOG is not set
 # CONFIG_HSA_AMD_P2P is not set
 CONFIG_HSA_AMD_SVM=y
diff --git a/SOURCES/kernel-aarch64-automotive-rhel.config b/SOURCES/kernel-aarch64-automotive-rhel.config
index 9e04a13..9ca02d8 100644
--- a/SOURCES/kernel-aarch64-automotive-rhel.config
+++ b/SOURCES/kernel-aarch64-automotive-rhel.config
@@ -852,7 +852,7 @@ CONFIG_BT=m
 # CONFIG_BTRFS_FS is not set
 # CONFIG_BT_RTL is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 CONFIG_BT_VIRTIO=m
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2715,7 +2715,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 # CONFIG_HP_WATCHDOG is not set
 # CONFIG_HSA_AMD_P2P is not set
 CONFIG_HSA_AMD_SVM=y
diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config
index 9db633b..73d2903 100644
--- a/SOURCES/kernel-aarch64-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-debug-rhel.config
@@ -796,7 +796,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2560,7 +2560,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
@@ -4164,7 +4164,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config
index 068a8a4..8288018 100644
--- a/SOURCES/kernel-aarch64-rhel.config
+++ b/SOURCES/kernel-aarch64-rhel.config
@@ -796,7 +796,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2544,7 +2544,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
@@ -4143,7 +4143,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-aarch64-rt-debug-rhel.config b/SOURCES/kernel-aarch64-rt-debug-rhel.config
index c034215..bb3c43c 100644
--- a/SOURCES/kernel-aarch64-rt-debug-rhel.config
+++ b/SOURCES/kernel-aarch64-rt-debug-rhel.config
@@ -796,7 +796,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2601,7 +2601,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
@@ -4205,7 +4205,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-aarch64-rt-rhel.config b/SOURCES/kernel-aarch64-rt-rhel.config
index 5f39654..041e9c5 100644
--- a/SOURCES/kernel-aarch64-rt-rhel.config
+++ b/SOURCES/kernel-aarch64-rt-rhel.config
@@ -796,7 +796,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -2585,7 +2585,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP03 is not set
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
-# CONFIG_HP_ILO is not set
+CONFIG_HP_ILO=m
 CONFIG_HP_WATCHDOG=m
 CONFIG_HSA_AMD_P2P=y
 CONFIG_HSA_AMD_SVM=y
@@ -4184,7 +4184,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config
index 8878fbf..7b14960 100644
--- a/SOURCES/kernel-ppc64le-debug-rhel.config
+++ b/SOURCES/kernel-ppc64le-debug-rhel.config
@@ -640,7 +640,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -3805,7 +3805,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config
index e011222..726ff42 100644
--- a/SOURCES/kernel-ppc64le-rhel.config
+++ b/SOURCES/kernel-ppc64le-rhel.config
@@ -640,7 +640,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -3785,7 +3785,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config
index f10bf09..3ad288d 100644
--- a/SOURCES/kernel-s390x-debug-rhel.config
+++ b/SOURCES/kernel-s390x-debug-rhel.config
@@ -638,7 +638,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -3782,7 +3782,7 @@ CONFIG_NAMESPACES=y
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config
index 52e5a5e..172a2e2 100644
--- a/SOURCES/kernel-s390x-rhel.config
+++ b/SOURCES/kernel-s390x-rhel.config
@@ -638,7 +638,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -3762,7 +3762,7 @@ CONFIG_NAMESPACES=y
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config
index 52ca052..2dc0449 100644
--- a/SOURCES/kernel-s390x-zfcpdump-rhel.config
+++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config
@@ -639,7 +639,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -3771,7 +3771,7 @@ CONFIG_NAMESPACES=y
 # CONFIG_NATIONAL_PHY is not set
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-x86_64-automotive-debug-rhel.config b/SOURCES/kernel-x86_64-automotive-debug-rhel.config
index d6a3ab1..426d075 100644
--- a/SOURCES/kernel-x86_64-automotive-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-automotive-debug-rhel.config
@@ -680,7 +680,7 @@ CONFIG_BT=m
 # CONFIG_BTRFS_FS is not set
 # CONFIG_BT_RTL is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
diff --git a/SOURCES/kernel-x86_64-automotive-rhel.config b/SOURCES/kernel-x86_64-automotive-rhel.config
index 8efcffc..718eea7 100644
--- a/SOURCES/kernel-x86_64-automotive-rhel.config
+++ b/SOURCES/kernel-x86_64-automotive-rhel.config
@@ -680,7 +680,7 @@ CONFIG_BT=m
 # CONFIG_BTRFS_FS is not set
 # CONFIG_BT_RTL is not set
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config
index f48f440..4b95a20 100644
--- a/SOURCES/kernel-x86_64-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-debug-rhel.config
@@ -667,7 +667,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -4045,7 +4045,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config
index e15ab42..ba0fa8b 100644
--- a/SOURCES/kernel-x86_64-rhel.config
+++ b/SOURCES/kernel-x86_64-rhel.config
@@ -667,7 +667,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -4025,7 +4025,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-x86_64-rt-debug-rhel.config b/SOURCES/kernel-x86_64-rt-debug-rhel.config
index 7287732..b891801 100644
--- a/SOURCES/kernel-x86_64-rt-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-rt-debug-rhel.config
@@ -667,7 +667,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -4086,7 +4086,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel-x86_64-rt-rhel.config b/SOURCES/kernel-x86_64-rt-rhel.config
index ba3ca85..a54c400 100644
--- a/SOURCES/kernel-x86_64-rt-rhel.config
+++ b/SOURCES/kernel-x86_64-rt-rhel.config
@@ -667,7 +667,7 @@ CONFIG_BT_RFCOMM_TTY=y
 # CONFIG_BTRFS_FS is not set
 CONFIG_BT_RTL=m
 # CONFIG_BT_SELFTEST is not set
-CONFIG_BTT=y
+# CONFIG_BTT is not set
 # CONFIG_BT_VIRTIO is not set
 CONFIG_BUG_ON_DATA_CORRUPTION=y
 CONFIG_BUG=y
@@ -4066,7 +4066,7 @@ CONFIG_NAMESPACES=y
 CONFIG_NATIONAL_PHY=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NCN26000_PHY is not set
-CONFIG_ND_BTT=m
+# CONFIG_ND_BTT is not set
 # CONFIG_NDC_DIS_DYNAMIC_CACHING is not set
 CONFIG_ND_CLAIM=y
 CONFIG_ND_PFN=m
diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog
index 6abb1ac..ffe2858 100644
--- a/SOURCES/kernel.changelog
+++ b/SOURCES/kernel.changelog
@@ -1,3 +1,46 @@
+* Tue Dec 17 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-36.el10]
+- configs: synchronize CONFIG_HP_ILO between flavors & enable on x86/arm (Charles Mirabile) [RHEL-65590]
+- crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70652]
+- s390/virtio_ccw: Fix dma_parm pointer not set up (Thomas Huth) [RHEL-69815]
+- fsnotify: fix sending inotify event with unexpected filename (Ian Kent) [RHEL-68847]
+- Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set" (Benjamin Marzinski) [RHEL-68140]
+- Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT" (Benjamin Marzinski) [RHEL-68140]
+- Revert "nvme: decouple basic ANA log page re-read support from native multipathing" (Benjamin Marzinski) [RHEL-68140]
+- Revert "nvme: nvme_mpath_init remove multipath check" (Benjamin Marzinski) [RHEL-68140]
+Resolves: RHEL-65590, RHEL-68140, RHEL-68847, RHEL-69815, RHEL-70652
+
+* Fri Dec 13 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-35.el10]
+- redhat: gating.yaml: drop unstable test (Jan Stancek)
+- CI: provide pipelines for automotive variant (Julio Faracco)
+- fadump: reserve param area if below boot_mem_top (Mamatha Inamdar) [RHEL-67986]
+- powerpc/fadump: allocate memory for additional parameters early (Mamatha Inamdar) [RHEL-67986]
+- cpufreq: intel_pstate: Update Balance-performance EPP for Granite Rapids (Steve Best) [RHEL-70009]
+- scsi: storvsc: Do not flag MAINTENANCE_IN return of SRB_STATUS_DATA_OVERRUN as an error (Cathy Avery) [RHEL-60525]
+- RHEL: disable the btt driver (Jeff Moyer) [RHEL-68504]
+- vfio/pci: Properly hide first-in-list PCIe extended capability (Alex Williamson) [RHEL-69745]
+- xfs: fix sparse inode limits on runt AG (Pavel Reichl) [RHEL-68542]
+Resolves: RHEL-60525, RHEL-67986, RHEL-68504, RHEL-68542, RHEL-69745, RHEL-70009
+
+* Tue Dec 10 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-34.el10]
+- iommu/tegra241-cmdqv: Fix alignment failure at max_n_shift (Jerry Snitselaar) [RHEL-67995]
+- crypto: qat - Fix missing destroy_workqueue in adf_init_aer() (Vladis Dronov) [RHEL-23197]
+- crypto: qat - Fix typo "accelaration" (Vladis Dronov) [RHEL-23197]
+- crypto: qat - Constify struct pm_status_row (Vladis Dronov) [RHEL-23197]
+- crypto: qat - remove faulty arbiter config reset (Vladis Dronov) [RHEL-23197]
+- crypto: qat - remove unused adf_devmgr_get_first (Vladis Dronov) [RHEL-23197]
+- crypto: qat/qat_4xxx - fix off by one in uof_get_name() (Vladis Dronov) [RHEL-23197]
+- crypto: qat/qat_420xx - fix off by one in uof_get_name() (Vladis Dronov) [RHEL-23197]
+- crypto: qat - remove check after debugfs_create_dir() (Vladis Dronov) [RHEL-23197]
+- redhat/kernel.spec.template: Link rtla against in-tree libcpupower (Tomas Glozar) [RHEL-40744]
+- rtla: Documentation: Mention --deepest-idle-state (Tomas Glozar) [RHEL-40744]
+- rtla/timerlat: Add --deepest-idle-state for hist (Tomas Glozar) [RHEL-40744]
+- rtla/timerlat: Add --deepest-idle-state for top (Tomas Glozar) [RHEL-40744]
+- rtla/utils: Add idle state disabling via libcpupower (Tomas Glozar) [RHEL-40744]
+- rtla: Add optional dependency on libcpupower (Tomas Glozar) [RHEL-40744]
+- tools/build: Add libcpupower dependency detection (Tomas Glozar) [RHEL-40744]
+- mm/memcg: Free percpu stats memory of dying memcg's (Waiman Long) [RHEL-67445]
+Resolves: RHEL-23197, RHEL-40744, RHEL-67445, RHEL-67995
+
 * Fri Dec 06 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-33.el10]
 - redhat: Re-enable CONFIG_INFINIBAND_VMWARE_PVRDMA for x86 (Vitaly Kuznetsov) [RHEL-41133]
 - HID: hyperv: streamline driver probe to avoid devres issues (Vitaly Kuznetsov) [RHEL-67329]
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 06c5120..58adb95 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/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 33
+%define pkgrelease 36
 %define kversion 6
-%define tarfile_release 6.12.0-33.el10
+%define tarfile_release 6.12.0-36.el10
 # This is needed to do merge window version magic
 %define patchlevel 12
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 33%{?buildid}%{?dist}
+%define specrelease 36%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.0-33.el10
+%define kabiversion 6.12.0-36.el10
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3106,6 +3106,13 @@ chmod +x tools/perf/check-headers.sh
 %global tools_make \
   CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" EXTRA_CFLAGS="${RPM_OPT_FLAGS}" %{make} %{?make_opts}
 
+%ifarch %{cpupowerarchs}
+    # link against in-tree libcpupower for idle state support
+    %global rtla_make %{tools_make} LDFLAGS="%{__global_ldflags} -L../../power/cpupower" INCLUDES="-I../../power/cpupower/lib"
+%else
+    %global rtla_make %{tools_make}
+%endif
+
 %if %{with_tools}
 %ifarch %{cpupowerarchs}
 # cpupower
@@ -3165,7 +3172,7 @@ pushd tools/verification/rv/
 popd
 pushd tools/tracing/rtla
 %{log_msg "build rtla"}
-%{tools_make}
+%{rtla_make}
 popd
 %endif
 
@@ -4290,6 +4297,46 @@ fi\
 #
 #
 %changelog
+* Tue Dec 17 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-36.el10]
+- configs: synchronize CONFIG_HP_ILO between flavors & enable on x86/arm (Charles Mirabile) [RHEL-65590]
+- crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70652]
+- s390/virtio_ccw: Fix dma_parm pointer not set up (Thomas Huth) [RHEL-69815]
+- fsnotify: fix sending inotify event with unexpected filename (Ian Kent) [RHEL-68847]
+- Revert "nvme: Return BLK_STS_TARGET if the DNR bit is set" (Benjamin Marzinski) [RHEL-68140]
+- Revert "nvme: allow local retry and proper failover for REQ_FAILFAST_TRANSPORT" (Benjamin Marzinski) [RHEL-68140]
+- Revert "nvme: decouple basic ANA log page re-read support from native multipathing" (Benjamin Marzinski) [RHEL-68140]
+- Revert "nvme: nvme_mpath_init remove multipath check" (Benjamin Marzinski) [RHEL-68140]
+
+* Fri Dec 13 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-35.el10]
+- redhat: gating.yaml: drop unstable test (Jan Stancek)
+- CI: provide pipelines for automotive variant (Julio Faracco)
+- fadump: reserve param area if below boot_mem_top (Mamatha Inamdar) [RHEL-67986]
+- powerpc/fadump: allocate memory for additional parameters early (Mamatha Inamdar) [RHEL-67986]
+- cpufreq: intel_pstate: Update Balance-performance EPP for Granite Rapids (Steve Best) [RHEL-70009]
+- scsi: storvsc: Do not flag MAINTENANCE_IN return of SRB_STATUS_DATA_OVERRUN as an error (Cathy Avery) [RHEL-60525]
+- RHEL: disable the btt driver (Jeff Moyer) [RHEL-68504]
+- vfio/pci: Properly hide first-in-list PCIe extended capability (Alex Williamson) [RHEL-69745]
+- xfs: fix sparse inode limits on runt AG (Pavel Reichl) [RHEL-68542]
+
+* Tue Dec 10 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-34.el10]
+- iommu/tegra241-cmdqv: Fix alignment failure at max_n_shift (Jerry Snitselaar) [RHEL-67995]
+- crypto: qat - Fix missing destroy_workqueue in adf_init_aer() (Vladis Dronov) [RHEL-23197]
+- crypto: qat - Fix typo "accelaration" (Vladis Dronov) [RHEL-23197]
+- crypto: qat - Constify struct pm_status_row (Vladis Dronov) [RHEL-23197]
+- crypto: qat - remove faulty arbiter config reset (Vladis Dronov) [RHEL-23197]
+- crypto: qat - remove unused adf_devmgr_get_first (Vladis Dronov) [RHEL-23197]
+- crypto: qat/qat_4xxx - fix off by one in uof_get_name() (Vladis Dronov) [RHEL-23197]
+- crypto: qat/qat_420xx - fix off by one in uof_get_name() (Vladis Dronov) [RHEL-23197]
+- crypto: qat - remove check after debugfs_create_dir() (Vladis Dronov) [RHEL-23197]
+- redhat/kernel.spec.template: Link rtla against in-tree libcpupower (Tomas Glozar) [RHEL-40744]
+- rtla: Documentation: Mention --deepest-idle-state (Tomas Glozar) [RHEL-40744]
+- rtla/timerlat: Add --deepest-idle-state for hist (Tomas Glozar) [RHEL-40744]
+- rtla/timerlat: Add --deepest-idle-state for top (Tomas Glozar) [RHEL-40744]
+- rtla/utils: Add idle state disabling via libcpupower (Tomas Glozar) [RHEL-40744]
+- rtla: Add optional dependency on libcpupower (Tomas Glozar) [RHEL-40744]
+- tools/build: Add libcpupower dependency detection (Tomas Glozar) [RHEL-40744]
+- mm/memcg: Free percpu stats memory of dying memcg's (Waiman Long) [RHEL-67445]
+
 * Fri Dec 06 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-33.el10]
 - redhat: Re-enable CONFIG_INFINIBAND_VMWARE_PVRDMA for x86 (Vitaly Kuznetsov) [RHEL-41133]
 - HID: hyperv: streamline driver probe to avoid devres issues (Vitaly Kuznetsov) [RHEL-67329]