Rebuild rocky9_5 with kernel-5.14.0-503.35.1.el9_5

PlaidCat · PlaidCat · commit c9a24474a2ec · 2025-04-08T18:13:28.000-04:00
Rebuild_History BUILDABLE
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
Number of commits in upstream range v5.14~1..master: 294815
Number of commits in rpm: 11
Number of commits matched with upstream: 8 (72.73%)
Number of commits in upstream but not in rpm: 294807
Number of commits NOT found in upstream: 3 (27.27%)

Rebuilding Kernel on Branch rocky9_5_rebuild_kernel-5.14.0-503.35.1.el9_5 for kernel-5.14.0-503.35.1.el9_5
Clean Cherry Picks: 7 (87.50%)
Empty Cherry Picks: 0 (0.00%)
_______________________________

Full Details Located here:
ciq/ciq_backports/kernel-5.14.0-503.35.1.el9_5/rebuild.details.txt

Includes:
* git commit header above
* Empty Commits with upstream SHA
* RPM ChangeLog Entries that could not be matched

Individual Empty Commit failures contained in the same containing directory.
The git message for empty commits will have the path for the failed commit.
File names are the first 8 characters of the upstream SHA
diff --git a/COPYING-5.14.0-503.35.1.el9_5 b/COPYING-5.14.0-503.35.1.el9_5
diff --git a/Makefile.rhelver b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 5
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 503.34.1
+RHEL_RELEASE = 503.35.1
 
 #
 # ZSTREAM
diff --git a/ciq/ciq_backports/kernel-5.14.0-503.35.1.el9_5/rebuild.details.txt b/ciq/ciq_backports/kernel-5.14.0-503.35.1.el9_5/rebuild.details.txt
@@ -0,0 +1,19 @@
+Rebuild_History BUILDABLE
+Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
+Number of commits in upstream range v5.14~1..master: 294815
+Number of commits in rpm: 11
+Number of commits matched with upstream: 8 (72.73%)
+Number of commits in upstream but not in rpm: 294807
+Number of commits NOT found in upstream: 3 (27.27%)
+
+Rebuilding Kernel on Branch rocky9_5_rebuild_kernel-5.14.0-503.35.1.el9_5 for kernel-5.14.0-503.35.1.el9_5
+Clean Cherry Picks: 7 (87.50%)
+Empty Cherry Picks: 0 (0.00%)
+_______________________________
+
+__EMPTY COMMITS__________________________
+
+__CHANGES NOT IN UPSTREAM________________
+Porting to Rocky Linux 9, debranding and Rocky branding'
+Ensure aarch64 kernel is not compressed'
+redhat/configs: replace IOMMU_DEFAULT_DMA_STRICT with IOMMU_DEFAULT_DMA_LAZY
diff --git a/configs/kernel-5.14.0-s390x-debug.config b/configs/kernel-5.14.0-s390x-debug.config
@@ -2762,8 +2762,8 @@ CONFIG_IOMMU_SUPPORT=y
 # end of Generic IOMMU Pagetable Support
 
 CONFIG_IOMMU_DEBUGFS=y
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
 CONFIG_IOMMUFD=y
diff --git a/configs/kernel-5.14.0-s390x.config b/configs/kernel-5.14.0-s390x.config
@@ -2785,8 +2785,8 @@ CONFIG_IOMMU_SUPPORT=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_DMA=y
 CONFIG_IOMMUFD=m
diff --git a/configs/kernel-s390x-debug-rhel.config b/configs/kernel-s390x-debug-rhel.config
@@ -2345,8 +2345,8 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_NONE is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 CONFIG_IOMMU_DEBUGFS=y
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMUFD_TEST=y
 CONFIG_IOMMUFD=y
diff --git a/configs/kernel-s390x-rhel.config b/configs/kernel-s390x-rhel.config
@@ -2329,8 +2329,8 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_NONE is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMUFD=m
 # CONFIG_IOMMUFD_TEST is not set
diff --git a/configs/kernel-s390x-zfcpdump-rhel.config b/configs/kernel-s390x-zfcpdump-rhel.config
@@ -2340,8 +2340,8 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_NONE is not set
 # CONFIG_IO_DELAY_UDELAY is not set
 # CONFIG_IOMMU_DEBUGFS is not set
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMUFD=m
 # CONFIG_IOMMUFD_TEST is not set
diff --git a/drivers/acpi/arm64/amba.c b/drivers/acpi/arm64/amba.c
@@ -22,7 +22,6 @@
 static const struct acpi_device_id amba_id_list[] = {
 	{"ARMH0061", 0}, /* PL061 GPIO Device */
 	{"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */
-	{"ARMHC500", 0}, /* ARM CoreSight ETM4x */
 	{"ARMHC501", 0}, /* ARM CoreSight ETR */
 	{"ARMHC502", 0}, /* ARM CoreSight STM */
 	{"ARMHC503", 0}, /* ARM CoreSight Debug */
diff --git a/redhat/configs/rhel/generic/s390x/CONFIG_IOMMU_DEFAULT_DMA_LAZY b/redhat/configs/rhel/generic/s390x/CONFIG_IOMMU_DEFAULT_DMA_LAZY
@@ -0,0 +1,13 @@
+# Symbol: IOMMU_DEFAULT_DMA_LAZY [=n]
+# Type  : bool
+# Defined at drivers/iommu/Kconfig:108
+#   Prompt: Translated - Lazy
+#   Depends on: <choice>
+#   Location:
+#     -> Device Drivers
+#       -> IOMMU Hardware Support (IOMMU_SUPPORT [=y])
+#         -> IOMMU default domain type (<choice> [=y])
+# 
+# 
+# 
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
diff --git a/redhat/configs/rhel/generic/s390x/CONFIG_IOMMU_DEFAULT_DMA_STRICT b/redhat/configs/rhel/generic/s390x/CONFIG_IOMMU_DEFAULT_DMA_STRICT
@@ -0,0 +1 @@
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
diff --git a/redhat/kernel.changelog-9.5 b/redhat/kernel.changelog-9.5
@@ -1,3 +1,15 @@
+* Sun Mar 23 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-503.35.1.el9_5]
+- cppc_cpufreq: Use desired perf if feedback ctrs are 0 or unchanged (Mark Langsdorf) [RHEL-78643]
+- coresight: etm4x: Add ACPI support in platform driver (Mark Salter) [RHEL-80223]
+- block: Fix lockdep warning in blk_mq_mark_tag_wait (Ming Lei) [RHEL-73024]
+- md: fix deadlock between mddev_suspend and flush bio (Nigel Croxon) [RHEL-76058] {CVE-2024-43855}
+- redhat/configs: replace IOMMU_DEFAULT_DMA_STRICT with IOMMU_DEFAULT_DMA_LAZY (Jerry Snitselaar) [RHEL-76412]
+- ibmvnic: Only record tx completed bytes once per handler (Mamatha Inamdar) [RHEL-71289]
+- ibmvnic: Only replenish rx pool when resources are getting low (Mamatha Inamdar) [RHEL-71289]
+- ibmvnic: Return error code on TX scrq flush fail (Mamatha Inamdar) [RHEL-71289]
+- intel_idle: fix ACPI _CST matching for newer Xeon platforms (David Arcari) [RHEL-62987]
+Resolves: RHEL-62987, RHEL-71289, RHEL-73024, RHEL-76058, RHEL-76412, RHEL-78643, RHEL-80223
+
 * Mon Mar 17 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-503.34.1.el9_5]
 - arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array (CKI Backport Bot) [RHEL-82734] {CVE-2025-21785}
 - crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70643]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ RHEL_MINOR = 5`
`12`	`12`	`#`
`13`	`13`	`# Use this spot to avoid future merge conflicts.`
`14`	`14`	`# Do not trim this comment.`
`15`		`-RHEL_RELEASE = 503.34.1`
	`15`	`+RHEL_RELEASE = 503.35.1`
`16`	`16`
`17`	`17`	`#`
`18`	`18`	`# ZSTREAM`