diff --git a/Makefile.rhelver b/Makefile.rhelver index 9e1fac485..8ceb9d970 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 = 42 +RHEL_RELEASE = 43 # # RHEL_REBASE_NUM diff --git a/def_variants.yaml.fedora b/def_variants.yaml.fedora index ecac2ae82..5d2c1060e 100644 --- a/def_variants.yaml.fedora +++ b/def_variants.yaml.fedora @@ -137,6 +137,7 @@ rules: - drivers/input/touchscreen/.*: modules - drivers/input/.*: modules-core - drivers/interconnect/.*: modules-core + - drivers/iommu/.*test.ko: modules-internal - drivers/iommu/.*: modules-core - drivers/irqchip/.*: modules-core diff --git a/def_variants.yaml.rhel b/def_variants.yaml.rhel index 5f64ee5dc..bc3f5e0a9 100644 --- a/def_variants.yaml.rhel +++ b/def_variants.yaml.rhel @@ -137,6 +137,7 @@ rules: - drivers/input/touchscreen/.*: modules - drivers/input/.*: modules-core - drivers/interconnect/.*: modules-core + - drivers/iommu/.*test.ko: modules-internal - drivers/iommu/.*: modules-core - drivers/irqchip/.*: modules-core diff --git a/kernel.changelog b/kernel.changelog index c124e5e7c..cb864f89f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Mon Jun 24 2024 Justin M. Forbes [6.10.0-0.rc5.43] +- redhat/kernel.spec: fix attributes of symvers file (Jan Stancek) +- redhat: add filtermods rule for iommu tests (Jan Stancek) +- Linux v6.10.0-0.rc5 +Resolves: + * Fri Jun 21 2024 Fedora Kernel Team [6.10.0-0.rc4.50736169ecc8.42] - fedora: arm: Enable basic support for S32G-VNP-RDB3 board (Enric Balletbo i Serra) - Linux v6.10.0-0.rc4.50736169ecc8 diff --git a/kernel.spec b/kernel.spec index 071ab588d..1eb515941 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc4.20240621git50736169ecc8.42 +%define pkgrelease 0.rc5.43 %define kversion 6 -%define tarfile_release 6.10-rc4-148-g50736169ecc8 +%define tarfile_release 6.10-rc5 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20240621git50736169ecc8.42%{?buildid}%{?dist} +%define specrelease 0.rc5.43%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -3889,7 +3889,7 @@ fi\ /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\ /lib/modules/%{KVERREL}%{?3:+%{3}}/config\ /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\ -%ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.%compext\ +%ghost %attr(0644, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.%compext\ %ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\ %ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\ %{expand:%%files -f kernel-%{?3:%{3}-}modules-core.list %{?3:%{3}-}modules-core}\ @@ -4018,6 +4018,11 @@ fi\ # # %changelog +* Mon Jun 24 2024 Justin M. Forbes [6.10.0-0.rc5.43] +- redhat/kernel.spec: fix attributes of symvers file (Jan Stancek) +- redhat: add filtermods rule for iommu tests (Jan Stancek) +- Linux v6.10.0-0.rc5 + * Fri Jun 21 2024 Fedora Kernel Team [6.10.0-0.rc4.50736169ecc8.42] - fedora: arm: Enable basic support for S32G-VNP-RDB3 board (Enric Balletbo i Serra) - Linux v6.10.0-0.rc4.50736169ecc8 diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index be383a496..531e6aa69 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -138,7 +138,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 14427547dc1e..b1f4e2e3d18e 100644 +index 4d36f943b3b1..16a0cc6567cc 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -2170,10 +2170,10 @@ index 17cccd14765f..7f0cef737224 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 37dd6ead72a4..31d7f80cd2d7 100644 +index 6b64af7d4927..b48acd6689e3 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -119,6 +119,14 @@ static const char *sd_cache_types[] = { +@@ -120,6 +120,14 @@ static const char *sd_cache_types[] = { "write back, no read (daft)" }; @@ -2188,7 +2188,7 @@ index 37dd6ead72a4..31d7f80cd2d7 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4249,6 +4257,11 @@ static int __init init_sd(void) +@@ -4253,6 +4261,11 @@ static int __init init_sd(void) goto err_out_class; } diff --git a/sources b/sources index 3498287ed..87c0bc32f 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.10-rc4-148-g50736169ecc8.tar.xz) = 25d29d06eac4f1ac4145bd33794af088467d5e08d24306c06a0f260e39be0404725b44162721f2c97770bdaec809ee3cd1c3565001d3f27f865cb723283a28d2 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 347571d467b15cff0b1d41714d018ff97457405aae7d8732f1ffd344f3b16f746985fb8377a97a31a1e2f40d813b1f3c2683467a772a16fcc246093e37eb0b25 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 913ba3782c728c18f3e8513cc60c42db4ec1cca5f0c970aec90cca6f0c554d75a38e7822bea0ff5cbff4184ead53fc1d4bb20a683e11cc5dbb1033b9aaa20967 +SHA512 (linux-6.10-rc5.tar.xz) = bc10c509c8b1680b5f0c42c498f5d43374f8f254eaa3fb313b40d4ff711ccfecf9eb9f817f429268d4b4b1d67efd6aaca787311dc71e3221276803b9b76af25f +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 0fe01318dbb992c15b472d9166697f1901d628732337bbdeca315672545eb64c0a8ee2a32e5f8b70262e6f55bcf8061dee86bb329432d5f6a18c3f51dde8cf04 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = da4196de30b6fc6b267778112087583e063907b50e26bbaebb78a758e269776532a084b4e187564d8419d996ef64c1f789afe54c55a0155515da645ddb11efd1