diff --git a/Makefile.rhelver b/Makefile.rhelver index 70acfeb2a..4ceadcd43 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 6 +RHEL_RELEASE = 8 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index f69d79167..03bb883a2 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/345f557fe9db6ac92eea8980b063e4ec4f0bc95a - 345f557fe9db6ac92eea8980b063e4ec4f0bc95a apply -Wno-error=unterminated-string-initialization temporarily +https://gitlab.com/cki-project/kernel-ark/-/commit/516737f21eeb6b63e282ffa1d1c0439150f0a6c4 + 516737f21eeb6b63e282ffa1d1c0439150f0a6c4 apply -Wno-error=unterminated-string-initialization temporarily https://gitlab.com/cki-project/kernel-ark/-/commit/99c8b56381c2f05815c77e6e41380b3d23559ea0 99c8b56381c2f05815c77e6e41380b3d23559ea0 mei: vsc: Fix fortify-panic caused by invalid counted_by() use diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 110ac7ec7..b55d292b0 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -5643,6 +5643,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 5a1417e5b..498d88197 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -5616,6 +5616,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index a9f8916bf..f3b9445a6 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1927,15 +1927,15 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_BLUEFIELD=m CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -4561,6 +4561,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 6a2695b2f..c176c5f89 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1919,15 +1919,15 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_BLUEFIELD=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -4540,6 +4540,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config index eef597a35..3e58eeb76 100644 --- a/kernel-aarch64-automotive-debug-rhel.config +++ b/kernel-aarch64-automotive-debug-rhel.config @@ -2074,17 +2074,17 @@ CONFIG_EARLY_PRINTK=y # CONFIG_EDAC_BLUEFIELD is not set CONFIG_EDAC_DEBUG=y # CONFIG_EDAC_DMC520 is not set -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y # CONFIG_EDAC_GHES is not set # CONFIG_EDAC_I10NM is not set # CONFIG_EDAC_IGEN6 is not set CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC=m -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y # CONFIG_EDAC_PND2 is not set CONFIG_EDAC_QCOM=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m # CONFIG_EDAC_THUNDERX is not set # CONFIG_EDAC_XGENE is not set @@ -4853,6 +4853,7 @@ CONFIG_NFSD_V2_ACL=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set # CONFIG_NFSD_V4 is not set # CONFIG_NFSD_V4_SECURITY_LABEL is not set # CONFIG_NFS_FSCACHE is not set diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config index 35e39f827..e11ddeb61 100644 --- a/kernel-aarch64-automotive-rhel.config +++ b/kernel-aarch64-automotive-rhel.config @@ -2066,17 +2066,17 @@ CONFIG_EARLY_PRINTK=y # CONFIG_EDAC_BLUEFIELD is not set # CONFIG_EDAC_DEBUG is not set # CONFIG_EDAC_DMC520 is not set -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y # CONFIG_EDAC_GHES is not set # CONFIG_EDAC_I10NM is not set # CONFIG_EDAC_IGEN6 is not set CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC=m -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y # CONFIG_EDAC_PND2 is not set CONFIG_EDAC_QCOM=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m # CONFIG_EDAC_THUNDERX is not set # CONFIG_EDAC_XGENE is not set @@ -4832,6 +4832,7 @@ CONFIG_NFSD_V2_ACL=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set # CONFIG_NFSD_V4 is not set # CONFIG_NFSD_V4_SECURITY_LABEL is not set # CONFIG_NFS_FSCACHE is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index f6fc83625..c409c0e53 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5643,6 +5643,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a33b1fe01..676e53609 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1925,15 +1925,15 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_BLUEFIELD=m CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -4559,6 +4559,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 591512544..03ca4dccf 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5616,6 +5616,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b833320c3..1b69947ff 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1917,15 +1917,15 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_BLUEFIELD=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -4538,6 +4538,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index 301a00973..fe9b9f0a9 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -5648,6 +5648,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index fc2a144b1..27146c932 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1964,15 +1964,15 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_BLUEFIELD=m CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -4600,6 +4600,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 834b4d50c..a42878f62 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -5621,6 +5621,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 628275992..4d24cc3ab 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1956,15 +1956,15 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_BLUEFIELD=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LAYERSCAPE=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SYNOPSYS=m CONFIG_EDAC_THUNDERX=m CONFIG_EDAC_XGENE=m @@ -4579,6 +4579,7 @@ CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 820143914..f37fe3ba7 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4693,6 +4693,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 87b0ac449..6a5bd61fe 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1655,14 +1655,14 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_CPC925=m CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SYNOPSYS is not set CONFIG_EDAC=y CONFIG_EEPROM_93CX6=y @@ -4171,6 +4171,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 07fbc6f06..0464cfd19 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4665,6 +4665,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 053f4e3fc..23bb3d3cd 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1647,14 +1647,14 @@ CONFIG_EARLY_PRINTK=y CONFIG_EDAC_CPC925=m # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SYNOPSYS is not set CONFIG_EDAC=y CONFIG_EEPROM_93CX6=y @@ -4151,6 +4151,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index fca47449b..08e58c82b 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -4715,6 +4715,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index c12217985..409fe0c77 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -4687,6 +4687,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index 560c07f98..4a2170cc4 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -4720,6 +4720,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index 694720a2c..18895e37f 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -4692,6 +4692,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 750db62cc..d8bbf5e29 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4667,6 +4667,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1a729b3b3..b3e5c28c2 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1657,15 +1657,15 @@ CONFIG_EARLY_PRINTK=y # CONFIG_ECRYPT_FS is not set CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m # CONFIG_EDAC is not set CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SYNOPSYS is not set # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93XX46 is not set @@ -4149,6 +4149,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index aaae2abe0..0128c4cf7 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4639,6 +4639,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6316d7cc4..04ad9a44f 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1649,15 +1649,15 @@ CONFIG_EARLY_PRINTK=y # CONFIG_ECRYPT_FS is not set # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m # CONFIG_EDAC is not set CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SYNOPSYS is not set # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93XX46 is not set @@ -4129,6 +4129,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index cab41cd9c..c5796386b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1650,15 +1650,15 @@ CONFIG_EARLY_PRINTK=y # CONFIG_ECRYPT_FS is not set # CONFIG_EDAC_DEBUG is not set CONFIG_EDAC_DMC520=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_IGEN6=m # CONFIG_EDAC is not set CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SYNOPSYS is not set # CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93XX46 is not set @@ -4140,6 +4140,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config index c32dab0f4..06147868e 100644 --- a/kernel-x86_64-automotive-debug-rhel.config +++ b/kernel-x86_64-automotive-debug-rhel.config @@ -1860,7 +1860,7 @@ CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DECODE_MCE=m # CONFIG_EDAC_DMC520 is not set # CONFIG_EDAC_E752X is not set -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y # CONFIG_EDAC_GHES is not set # CONFIG_EDAC_I10NM is not set # CONFIG_EDAC_I3000 is not set @@ -1875,10 +1875,10 @@ CONFIG_EDAC_DECODE_MCE=m # CONFIG_EDAC_IGEN6 is not set CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC=m -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y # CONFIG_EDAC_PND2 is not set # CONFIG_EDAC_SBRIDGE is not set -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SKX is not set # CONFIG_EDAC_SYNOPSYS is not set # CONFIG_EDAC_X38 is not set @@ -4574,6 +4574,7 @@ CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set # CONFIG_NFSD_V4 is not set # CONFIG_NFSD_V4_SECURITY_LABEL is not set # CONFIG_NFS_FSCACHE is not set diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config index 0a5a45878..3067683f1 100644 --- a/kernel-x86_64-automotive-rhel.config +++ b/kernel-x86_64-automotive-rhel.config @@ -1852,7 +1852,7 @@ CONFIG_EDAC_AMD64=m CONFIG_EDAC_DECODE_MCE=m # CONFIG_EDAC_DMC520 is not set # CONFIG_EDAC_E752X is not set -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y # CONFIG_EDAC_GHES is not set # CONFIG_EDAC_I10NM is not set # CONFIG_EDAC_I3000 is not set @@ -1867,10 +1867,10 @@ CONFIG_EDAC_DECODE_MCE=m # CONFIG_EDAC_IGEN6 is not set CONFIG_EDAC_LEGACY_SYSFS=y CONFIG_EDAC=m -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y # CONFIG_EDAC_PND2 is not set # CONFIG_EDAC_SBRIDGE is not set -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y # CONFIG_EDAC_SKX is not set # CONFIG_EDAC_SYNOPSYS is not set # CONFIG_EDAC_X38 is not set @@ -4554,6 +4554,7 @@ CONFIG_NFS_DISABLE_UDP_SUPPORT=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set # CONFIG_NFSD_V4 is not set # CONFIG_NFSD_V4_SECURITY_LABEL is not set # CONFIG_NFS_FSCACHE is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 0f97b4582..059d094d9 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5095,6 +5095,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 43a281da7..7a55fb347 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1787,7 +1787,7 @@ CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_DMC520=m CONFIG_EDAC_E752X=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_I3000=m @@ -1801,10 +1801,10 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m CONFIG_EDAC_SBRIDGE=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SKX=m # CONFIG_EDAC_SYNOPSYS is not set CONFIG_EDAC_X38=m @@ -4434,6 +4434,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 9c11d420c..263738a63 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5069,6 +5069,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7b2edd69a..5b6b9ca1c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1779,7 +1779,7 @@ CONFIG_EDAC_AMD64=m CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_DMC520=m CONFIG_EDAC_E752X=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_I3000=m @@ -1793,10 +1793,10 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m CONFIG_EDAC_SBRIDGE=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SKX=m # CONFIG_EDAC_SYNOPSYS is not set CONFIG_EDAC_X38=m @@ -4414,6 +4414,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 0d7d8a379..608936108 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -5100,6 +5100,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 7ca918971..6892d9439 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1826,7 +1826,7 @@ CONFIG_EDAC_DEBUG=y CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_DMC520=m CONFIG_EDAC_E752X=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_I3000=m @@ -1840,10 +1840,10 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m CONFIG_EDAC_SBRIDGE=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SKX=m # CONFIG_EDAC_SYNOPSYS is not set CONFIG_EDAC_X38=m @@ -4475,6 +4475,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 08b074cf9..8428d6eef 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -5074,6 +5074,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V4_2_INTER_SSC=y +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 38f356a77..e87f202a2 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1818,7 +1818,7 @@ CONFIG_EDAC_AMD64=m CONFIG_EDAC_DECODE_MCE=m CONFIG_EDAC_DMC520=m CONFIG_EDAC_E752X=m -# CONFIG_EDAC_ECS is not set +CONFIG_EDAC_ECS=y CONFIG_EDAC_GHES=y CONFIG_EDAC_I10NM=m CONFIG_EDAC_I3000=m @@ -1832,10 +1832,10 @@ CONFIG_EDAC_I82975X=m CONFIG_EDAC_IE31200=m CONFIG_EDAC_IGEN6=m CONFIG_EDAC_LEGACY_SYSFS=y -# CONFIG_EDAC_MEM_REPAIR is not set +CONFIG_EDAC_MEM_REPAIR=y CONFIG_EDAC_PND2=m CONFIG_EDAC_SBRIDGE=m -# CONFIG_EDAC_SCRUB is not set +CONFIG_EDAC_SCRUB=y CONFIG_EDAC_SKX=m # CONFIG_EDAC_SYNOPSYS is not set CONFIG_EDAC_X38=m @@ -4455,6 +4455,7 @@ CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V3_ACL=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V4_2_INTER_SSC is not set +# CONFIG_NFSD_V4_DELEG_TIMESTAMPS is not set CONFIG_NFSD_V4_SECURITY_LABEL=y CONFIG_NFSD_V4=y CONFIG_NFS_FSCACHE=y diff --git a/kernel.changelog b/kernel.changelog index da40aa777..9a2f5c23d 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Tue Apr 01 2025 Fedora Kernel Team [6.15.0-0.rc0.08733088b566.8] +- apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +Resolves: + +* Tue Apr 01 2025 Fedora Kernel Team [6.15.0-0.rc0.08733088b566.7] +- redhat/kernel.spec: list python3-wheel explicitly for Fedora<42 (Jan Stancek) +- handle man-page for rv-mon-sched in redhat/kernel.spec.template (Thorsten Leemhuis) +- redhat: find-debuginfo workaround is no longer needed on F42 (Jan Stancek) +- redhat/kernel.spec: use target versions of tools for debugedit and gdb-add-index (Jan Stancek) +- Linux v6.15.0-0.rc0.08733088b566 +Resolves: + * Mon Mar 31 2025 Fedora Kernel Team [6.15.0-0.rc0.4e82c87058f4.6] - redhat: make ENABLE_WERROR enable also KVM_WERROR (Jan Stancek) - Linux v6.15.0-0.rc0.4e82c87058f4 diff --git a/kernel.spec b/kernel.spec index f6e86f6c9..5f0946e90 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.15.0 %define specversion 6.15.0 %define patchversion 6.15 -%define pkgrelease 0.rc0.20250331git4e82c87058f4.6 +%define pkgrelease 0.rc0.20250401git08733088b566.8 %define kversion 6 -%define tarfile_release 6.14-10892-g4e82c87058f4 +%define tarfile_release 6.14-11270-g08733088b566 # This is needed to do merge window version magic %define patchlevel 15 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20250331git4e82c87058f4.6%{?buildid}%{?dist} +%define specrelease 0.rc0.20250401git08733088b566.8%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.15.0 @@ -766,6 +766,7 @@ BuildRequires: libnl3-devel %if %{with_tools} && %{with_ynl} BuildRequires: python3-pyyaml python3-jsonschema python3-pip python3-setuptools >= 61 +BuildRequires: (python3-wheel if python3-setuptools < 70) %endif %if %{with_tools} || %{signmodules} || %{signkernel} @@ -822,13 +823,16 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu %define cross_opts CROSS_COMPILE=%{_build_arch}-linux-gnu- %define __strip %{_build_arch}-linux-gnu-strip +%if 0%{?fedora} && 0%{?fedora} <= 41 # Work around find-debuginfo for cross builds. # find-debuginfo doesn't support any of CROSS options (RHEL-21797), # and since debugedit > 5.0-16.el10, or since commit # dfe1f7ff30f4 ("find-debuginfo.sh: Exit with real exit status in parallel jobs") -# it now aborts and build fails. +# it now aborts on failure and build fails. +# debugedit-5.1-5 in F42 added support to override tools with target versions. %undefine _include_gdb_index %endif +%endif # These below are required to build man pages %if %{with_perf} @@ -3276,12 +3280,24 @@ find Documentation -type d | xargs chmod u+w rm -rf $RPM_BUILD_ROOT/usr/lib/debug/usr/src; \ %{nil} +# Make debugedit and gdb-add-index use target versions of tools +# when cross-compiling. This is supported since debugedit-5.1-5.fc42 +# https://inbox.sourceware.org/debugedit/20250220153858.963312-1-mark@klomp.org/ +%if %{with_cross} +%define __override_target_tools_for_debugedit \ + export OBJCOPY=%{_build_arch}-linux-gnu-objcopy \ + export NM=%{_build_arch}-linux-gnu-nm \ + export READELF=%{_build_arch}-linux-gnu-readelf \ +%{nil} +%endif + # # Disgusting hack alert! We need to ensure we sign modules *after* all # invocations of strip occur, which is in __debug_install_post if # find-debuginfo.sh runs, and __os_install_post if not. # %define __spec_install_post \ + %{?__override_target_tools_for_debugedit:%{__override_target_tools_for_debugedit}}\ %{?__debug_package:%{__debug_install_post}}\ %{__arch_install_post}\ %{__os_install_post}\ @@ -4213,11 +4229,16 @@ fi\ # # %changelog -* Mon Mar 31 2025 Justin M. Forbes [6.15.0-0.rc0.20250331git4e82c87058f4.6] -- automotive: enable CONFIG_PROBE_EVENTS_BTF_ARGS (Scott Weaver) -- handle man-page for rv-mon-sched in redhat/kernel.spec.template (Thorsten Leemhuis) +* Tue Apr 01 2025 Fedora Kernel Team [6.15.0-0.rc0.08733088b566.8] - apply -Wno-error=unterminated-string-initialization temporarily (Thorsten Leemhuis) +* Tue Apr 01 2025 Fedora Kernel Team [6.15.0-0.rc0.08733088b566.7] +- redhat/kernel.spec: list python3-wheel explicitly for Fedora<42 (Jan Stancek) +- handle man-page for rv-mon-sched in redhat/kernel.spec.template (Thorsten Leemhuis) +- redhat: find-debuginfo workaround is no longer needed on F42 (Jan Stancek) +- redhat/kernel.spec: use target versions of tools for debugedit and gdb-add-index (Jan Stancek) +- Linux v6.15.0-0.rc0.08733088b566 + * Mon Mar 31 2025 Fedora Kernel Team [6.15.0-0.rc0.4e82c87058f4.6] - redhat: make ENABLE_WERROR enable also KVM_WERROR (Jan Stancek) - Linux v6.15.0-0.rc0.4e82c87058f4 diff --git a/patch-6.15-redhat.patch b/patch-6.15-redhat.patch index 6bbe2dd9a..ebce55e62 100644 --- a/patch-6.15-redhat.patch +++ b/patch-6.15-redhat.patch @@ -2483,7 +2483,7 @@ index bf3bbac4e02a..b9840b1a43fe 100644 LSM_HOOK(int, 0, perf_event_open, int type) LSM_HOOK(int, 0, perf_event_alloc, struct perf_event *event) diff --git a/include/linux/module.h b/include/linux/module.h -index d9a5183a9fe7..7f27cb46ee1a 100644 +index d94b196d5a34..ead452836a9f 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -428,6 +428,7 @@ struct module { @@ -2494,7 +2494,7 @@ index d9a5183a9fe7..7f27cb46ee1a 100644 struct kobject *holders_dir; /* Exported symbols */ -@@ -1011,4 +1012,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, +@@ -1017,4 +1018,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, #endif /* CONFIG_MODULES && CONFIG_KALLSYMS */ @@ -3327,7 +3327,7 @@ index 9794446bc8c6..48ad59d23531 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index debeb0eb15d7..b46c60abfaca 100644 +index a2859dc3eea6..dda7d7026bbb 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -65,6 +65,8 @@ @@ -3367,7 +3367,7 @@ index debeb0eb15d7..b46c60abfaca 100644 err = rewrite_section_headers(info, flags); if (err) return err; -@@ -3783,6 +3792,10 @@ void print_modules(void) +@@ -3796,6 +3805,10 @@ void print_modules(void) pr_cont(" [last unloaded: %s%s]", last_unloaded_module.name, last_unloaded_module.taints); pr_cont("\n"); diff --git a/sources b/sources index a900b2409..4b9cb35cc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.14-10892-g4e82c87058f4.tar.xz) = 96de2a0397aa2f33c8b6051130fdf84a2bd89b3be93657e36905c18dfe756c07fa272d5c17ff8578a40a1abd4942c0c76907b88f1979dfea6be84173e2aabec5 -SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 3af57e521ecc03cb97b2083ecd2d5bcc97abd3d8ce94fcb26a7470cdabad125f6dfbeee450c5210657001314dadc283b58e2ce084ef0311a341ca5a9df173440 -SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = 291ae36212f7197675ce04894d1f381d1442a42358e0903516f03e872715cd428980869cbec21006b61b57d13605d6c1e5cecb763d3597d6ee3b22593a1a7cb4 +SHA512 (linux-6.14-11270-g08733088b566.tar.xz) = 4898448aaad500539ade8792820f89e8368da7124188d9a86ee4459d3679b1ce9107f6df797b7de48ae2c59b6d9ee2befb8dbf1848ee7facfc9408233a35221a +SHA512 (kernel-abi-stablelists-6.15.0.tar.xz) = 3e23c5662154c0f9a2a6309a8480db6957dcef7237a530309f8f8d70bddd4eb56c3ce61ead7cd2af2e7c229b4672c88b102301a8a499f0b9692ab838c60a9521 +SHA512 (kernel-kabi-dw-6.15.0.tar.xz) = b8c8fea730094100f354b512a5a1f158c2f99fe199abcd8cd6d8f5ca7146d95cc04ff88bdb3157c1bd775c5f5b4fc06759f8c6db58d3dd70255aa32443147d0e