diff --git a/Makefile.rhelver b/Makefile.rhelver
index 4920835d4..61b5cf398 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 = 35
+RHEL_RELEASE = 36
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 0aecd309b..ba326ef89 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -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
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 2cff149b4..5950e9cfe 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -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
diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config
index e2c784225..da1e01c95 100644
--- a/kernel-aarch64-automotive-debug-rhel.config
+++ b/kernel-aarch64-automotive-debug-rhel.config
@@ -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/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config
index e5f4d1b83..9ca02d881 100644
--- a/kernel-aarch64-automotive-rhel.config
+++ b/kernel-aarch64-automotive-rhel.config
@@ -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/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 8a88a9621..73d290353 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -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
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 1969e1491..8288018c4 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -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
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index c22ad6236..bb3c43c8e 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -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
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index 77c7c8ba2..041e9c571 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -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
diff --git a/kernel.changelog b/kernel.changelog
index 2589192e9..ffe2858e9 100644
--- a/kernel.changelog
+++ b/kernel.changelog
@@ -1,3 +1,14 @@
+* 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)
diff --git a/kernel.spec b/kernel.spec
index c453a8bc1..8258f388f 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 35
+%define pkgrelease 36
 %define kversion 6
-%define tarfile_release 6.12.0-35.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 35%{?buildid}%{?dist}
+%define specrelease 36%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.12.0-35.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
@@ -4297,6 +4297,16 @@ 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)
diff --git a/sources b/sources
index 9ad7aca1f..53a32605a 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-35.el10.tar.xz) = d2a14edbee618383a966b52f67ec1b1c8f8e6228182296affff3699fe11f29cc7b3e7fffeaae2924ff8e12acd5960f577bded0b0f823ce13945f220ea38ad6aa
-SHA512 (kernel-abi-stablelists-6.12.0-35.el10.tar.xz) = 1265f5afcfa7bb4d8d515ab41e4b98558005750eaf85dbbee043cbea8c451c4d972dbf77c19f7de1ce2cf0062664d1e3d0cf62f673d453b5822bc3919877f26d
-SHA512 (kernel-kabi-dw-6.12.0-35.el10.tar.xz) = f243486b1670da339d68aa999a5c0bacbba5fe1119420cd089271a68c8777514f54ade656164827a6b83499113a4c3795dc489ac65df48e91ab7e099c051c5a0
+SHA512 (linux-6.12.0-36.el10.tar.xz) = 57f3c8bf417d1a8e3e9c704ae40021b43d39dc0d0b4dcbf142046d2162cb0dca5011de6fd2c2afb7a680af659aa6a8b64d010bd7adb8047a1efa12e6c786abe4
+SHA512 (kernel-abi-stablelists-6.12.0-36.el10.tar.xz) = cd16aac7f952302eccab4e9b75439f484ee3fae27486607f09e1e94ea0e698b60aed4948274c57c9f898f3090630430a504af072161fa0a78a5ba075d5ce766f
+SHA512 (kernel-kabi-dw-6.12.0-36.el10.tar.xz) = b3525532603299a3c22dc64150f1431e20b30b742bb67abc5815465575adfe9977b7e49d03bbc0ac4ef2271288c3d04c0d05e2049b6afc98b47bf9c78185343e