From a99ccfca2f77e507b92b49870709f0903c1be1de Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 22 Jan 2025 07:36:57 +0000
Subject: [PATCH] Import from CS git

---
 .gitignore        |  2 +-
 .kernel.metadata  |  4 ++--
 SPECS/kernel.spec | 17 +++++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b095483c2..10069becc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@ SOURCES/centossecureboot201.cer
 SOURCES/centossecurebootca2.cer
 SOURCES/kernel-abi-stablelists-4.18.0-553.tar.bz2
 SOURCES/kernel-kabi-dw-4.18.0-553.tar.bz2
-SOURCES/linux-4.18.0-553.34.1.el8_10.tar.xz
+SOURCES/linux-4.18.0-553.36.1.el8_10.tar.xz
 SOURCES/redhatsecureboot302.cer
 SOURCES/redhatsecureboot303.cer
 SOURCES/redhatsecureboot501.cer
diff --git a/.kernel.metadata b/.kernel.metadata
index 1c437d601..c4d69f491 100644
--- a/.kernel.metadata
+++ b/.kernel.metadata
@@ -1,8 +1,8 @@
 2ba40bf9138b48311e5aa1b737b7f0a8ad66066f SOURCES/centossecureboot201.cer
 bfdb3d7cffc43f579655af5155d50c08671d95e5 SOURCES/centossecurebootca2.cer
-590542c9ad7ea2fd363aa4f3540ac09557d5e5d7 SOURCES/kernel-abi-stablelists-4.18.0-553.tar.bz2
+df51cff5c8126dfe870be3afb36a4034169d61f2 SOURCES/kernel-abi-stablelists-4.18.0-553.tar.bz2
 618f2302d26295e300718d59e8551a0cdfc98022 SOURCES/kernel-kabi-dw-4.18.0-553.tar.bz2
-51d3f6c8dea7f8709dd9fcbd000cae59595afb85 SOURCES/linux-4.18.0-553.34.1.el8_10.tar.xz
+0299b75ce8b241f8faeb6b265d7710b456876db7 SOURCES/linux-4.18.0-553.36.1.el8_10.tar.xz
 13e5cd3f856b472fde80a4deb75f4c18dfb5b255 SOURCES/redhatsecureboot302.cer
 e89890ca0ded2f9058651cc5fa838b78db2e6cc2 SOURCES/redhatsecureboot303.cer
 ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 944e8efc5..4d075dff6 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -38,10 +38,10 @@
 # define buildid .local
 
 %define specversion 4.18.0
-%define pkgrelease 553.34.1.el8_10
+%define pkgrelease 553.36.1.el8_10
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 553.34.1%{?dist}
+%define specrelease 553.36.1%{?dist}
 
 %define pkg_release %{specrelease}%{?buildid}
 
@@ -2696,6 +2696,19 @@ fi
 #
 #
 %changelog
+* Thu Jan 09 2025 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-553.36.1.el8_10]
+- cpufreq: intel_pstate: Support Emerald Rapids OOB mode (David Arcari) [RHEL-59649]
+- scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-28790]
+- scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset (John Meneghini) [RHEL-28790]
+- scsi: st: Don't modify unknown block number in MTIOCGET (John Meneghini) [RHEL-28790]
+- Reapply "scsi: st: Add third party poweron reset handling" (John Meneghini) [RHEL-28790]
+
+* Thu Jan 02 2025 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-553.35.1.el8_10]
+- samples: pktgen: allow to specify destination port (Hangbin Liu) [RHEL-56480]
+- samples: pktgen: add some helper functions for port parsing (Hangbin Liu) [RHEL-56480]
+- scsi: storvsc: Do not flag MAINTENANCE_IN return of SRB_STATUS_DATA_OVERRUN as an error (Cathy Avery) [RHEL-71396]
+- scsi: storvsc: Handle additional SRB status values (Cathy Avery) [RHEL-71396]
+
 * Thu Dec 12 2024 Denys Vlasenko <dvlasenk@redhat.com> [4.18.0-553.34.1.el8_10]
 - mptcp: cope racing subflow creation in mptcp_rcv_space_adjust (Davide Caratti) [RHEL-69667] {CVE-2024-53122}
 - NFS: nfs_async_write_reschedule_io must not recurse into the writeback code (Benjamin Coddington) [RHEL-68647]