diff --git a/Makefile.rhelver b/Makefile.rhelver index 3554f91af..9e42da42f 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 = 19 +RHEL_RELEASE = 22 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 9aa980797..6d64a4eaf 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/a01f40d4ee680cab13c628779536d5040c203a4c - a01f40d4ee680cab13c628779536d5040c203a4c x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/1e390694b570ac27a43331cc2d924db0f9e3dabb + 1e390694b570ac27a43331cc2d924db0f9e3dabb x86/insn_decoder_test: allow longer symbol-names https://gitlab.com/cki-project/kernel-ark/-/commit/c4589d81040a97b7adb381203b68b893f5df7b1c c4589d81040a97b7adb381203b68b893f5df7b1c crypto: sig - Disable signing diff --git a/kernel-aarch64-automotive-debug-rhel.config b/kernel-aarch64-automotive-debug-rhel.config index aeee61066..936bbd8e8 100644 --- a/kernel-aarch64-automotive-debug-rhel.config +++ b/kernel-aarch64-automotive-debug-rhel.config @@ -715,8 +715,8 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_UBLK is not set CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y -CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y @@ -3288,7 +3288,7 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_IOSM is not set # CONFIG_IO_STRICT_DEVMEM is not set -CONFIG_IO_URING=y +# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES_LEGACY=m diff --git a/kernel-aarch64-automotive-rhel.config b/kernel-aarch64-automotive-rhel.config index cfb3559a8..d857272a1 100644 --- a/kernel-aarch64-automotive-rhel.config +++ b/kernel-aarch64-automotive-rhel.config @@ -715,8 +715,8 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_UBLK is not set CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y -CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y @@ -3272,7 +3272,7 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI_DEBUG is not set # CONFIG_IOSM is not set # CONFIG_IO_STRICT_DEVMEM is not set -CONFIG_IO_URING=y +# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES_LEGACY=m diff --git a/kernel-x86_64-automotive-debug-rhel.config b/kernel-x86_64-automotive-debug-rhel.config index b78e87a00..95ae37cc6 100644 --- a/kernel-x86_64-automotive-debug-rhel.config +++ b/kernel-x86_64-automotive-debug-rhel.config @@ -551,8 +551,8 @@ CONFIG_BLK_DEV_SD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_UBLK is not set CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y -CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y @@ -3046,7 +3046,7 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI is not set # CONFIG_IOSM is not set # CONFIG_IO_STRICT_DEVMEM is not set -CONFIG_IO_URING=y +# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES_LEGACY=m diff --git a/kernel-x86_64-automotive-rhel.config b/kernel-x86_64-automotive-rhel.config index bc8c83ef5..74a9cf9c4 100644 --- a/kernel-x86_64-automotive-rhel.config +++ b/kernel-x86_64-automotive-rhel.config @@ -551,8 +551,8 @@ CONFIG_BLK_DEV_SD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y +# CONFIG_BLK_DEV_UBLK is not set CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y -CONFIG_BLK_DEV_UBLK=m CONFIG_BLK_DEV_WRITE_MOUNTED=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y @@ -3030,7 +3030,7 @@ CONFIG_IOSCHED_BFQ=y # CONFIG_IOSF_MBI is not set # CONFIG_IOSM is not set # CONFIG_IO_STRICT_DEVMEM is not set -CONFIG_IO_URING=y +# CONFIG_IO_URING is not set # CONFIG_IP5XXX_POWER is not set CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES_LEGACY=m diff --git a/kernel.changelog b/kernel.changelog index 32cae010a..2636a1b8e 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,21 @@ -* Fri Dec 06 2024 Fedora Kernel Team [6.13.0-0.rc1.b8f52214c61a.19] +* Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.22] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.21] +- redhat/configs: automotive: disable CONFIG_IO_URING (Ian Mullins) +- Linux v6.13.0-0.rc2 +Resolves: + +* Sun Dec 08 2024 Fedora Kernel Team [6.13.0-0.rc1.7503345ac5f5.20] +- Linux v6.13.0-0.rc1.7503345ac5f5 +Resolves: + +* Sat Dec 07 2024 Fedora Kernel Team [6.13.0-0.rc1.b5f217084ab3.19] +- Linux v6.13.0-0.rc1.b5f217084ab3 +Resolves: + * Fri Dec 06 2024 Fedora Kernel Team [6.13.0-0.rc1.b8f52214c61a.18] - redhat/kernel.spec.template: Link rtla against in-tree libcpupower (Tomas Glozar) - Linux v6.13.0-0.rc1.b8f52214c61a diff --git a/kernel.spec b/kernel.spec index d932d3958..69a0c6536 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.13.0 %define specversion 6.13.0 %define patchversion 6.13 -%define pkgrelease 0.rc1.20241206gitb8f52214c61a.19 +%define pkgrelease 0.rc2.22 %define kversion 6 -%define tarfile_release 6.13-rc1-182-gb8f52214c61a +%define tarfile_release 6.13-rc2 # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20241206gitb8f52214c61a.19%{?buildid}%{?dist} +%define specrelease 0.rc2.22%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4171,10 +4171,20 @@ fi\ # # %changelog -* Fri Dec 06 2024 Fedora Kernel Team [6.13.0-0.rc1.b8f52214c61a.19] +* Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.22] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Mon Dec 09 2024 Fedora Kernel Team [6.13.0-0.rc2.21] +- redhat/configs: automotive: disable CONFIG_IO_URING (Ian Mullins) +- Linux v6.13.0-0.rc2 + +* Sun Dec 08 2024 Fedora Kernel Team [6.13.0-0.rc1.7503345ac5f5.20] +- Linux v6.13.0-0.rc1.7503345ac5f5 + +* Sat Dec 07 2024 Fedora Kernel Team [6.13.0-0.rc1.b5f217084ab3.19] +- Linux v6.13.0-0.rc1.b5f217084ab3 + * Fri Dec 06 2024 Fedora Kernel Team [6.13.0-0.rc1.b8f52214c61a.18] - redhat/kernel.spec.template: Link rtla against in-tree libcpupower (Tomas Glozar) - Linux v6.13.0-0.rc1.b8f52214c61a diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index 8d240d48d..0fe16618c 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -190,7 +190,7 @@ index 000000000000..fd77bd5c97e2 + +endmenu diff --git a/Makefile b/Makefile -index 93ab62cef244..2b641eb228b0 100644 +index 64c594bd7ad0..0fc23f9db9ca 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1903,13 +1903,13 @@ index 599030e1e890..74dd17d516c0 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c -index a798e26c6402..6855c3e7e5b3 100644 +index d0549a4daf76..a324b5e2db74 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -5378,6 +5378,10 @@ static void mptsas_remove(struct pci_dev *pdev) } - static struct pci_device_id mptsas_pci_table[] = { + static const struct pci_device_id mptsas_pci_table[] = { +#ifdef CONFIG_RHEL_DIFFERENCES + { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, + PCI_VENDOR_ID_VMWARE, PCI_ANY_ID }, @@ -1917,7 +1917,7 @@ index a798e26c6402..6855c3e7e5b3 100644 { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064, PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, -@@ -5390,6 +5394,7 @@ static struct pci_device_id mptsas_pci_table[] = { +@@ -5390,6 +5394,7 @@ static const struct pci_device_id mptsas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP, PCI_ANY_ID, PCI_ANY_ID }, @@ -1926,13 +1926,13 @@ index a798e26c6402..6855c3e7e5b3 100644 }; MODULE_DEVICE_TABLE(pci, mptsas_pci_table); diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c -index 574b882c9a85..5a8b2ea7365a 100644 +index 4184d0c70ac3..04fd4dbb5c27 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -1239,12 +1239,17 @@ static struct spi_function_template mptspi_transport_functions = { */ - static struct pci_device_id mptspi_pci_table[] = { + static const struct pci_device_id mptspi_pci_table[] = { +#ifdef CONFIG_RHEL_DIFFERENCES + { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030, + PCI_VENDOR_ID_VMWARE, PCI_ANY_ID }, @@ -1980,7 +1980,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 52b01a15aad1..83a27a937430 100644 +index d169a30eb935..a57650116e76 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -276,6 +276,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2321,7 +2321,7 @@ index 0b1616e93cf4..85fc52038a82 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index 8e75e2e279a4..90866366148b 100644 +index 50f1dcb6d584..993652508fbb 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); @@ -2385,10 +2385,10 @@ index f2a55aa5fe65..8f4a054ae99f 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 7f980e6141c2..4930fa5cd3d1 100644 +index 7ab717ed7232..57beb0953df8 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -8116,6 +8116,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { +@@ -8117,6 +8117,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { }; static struct pci_device_id qla2xxx_pci_tbl[] = { @@ -2396,7 +2396,7 @@ index 7f980e6141c2..4930fa5cd3d1 100644 { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) }, -@@ -8128,13 +8129,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { +@@ -8129,13 +8130,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) }, @@ -4589,7 +4589,7 @@ index 000000000000..84e22b1730cc +} +late_initcall(__add_rh_flag); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 0584cbcdbd2d..c1bbb30303e3 100644 +index fb787a5715f5..d57cf26a676e 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -27,6 +27,7 @@ diff --git a/sources b/sources index abf8d7aa0..768307c19 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc1-182-gb8f52214c61a.tar.xz) = d94b84b50f4f77fd49c7e7709ea2ce539a6d027449fb6d1a7eed1e356d2ac4bd8f8418d2c9b1f337e9243f062a4de8eac339400da3445ff1c2b38537a0c3a61e -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 1065df09612e7706baeac661f230229452475dc343d713d8318e28cdb50d19ff9d3d6fce9f8a91e522d4738cb1afa1a50605e623130c6ee58d5425ffa3af8ac1 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = c744c7f1b5fd9504c952ddc42e80a8f3a898e74973f8f625c7a71c2599a38d415b97a97baabb2c53fb2ba6317b01468124b6b1be70110278d58afb56115dc7d4 +SHA512 (linux-6.13-rc2.tar.xz) = a4021c258172c1b58d7964285b73f01b7566238cb74655030164209e8400e886a36cf43aefc7b2e2b16481de9b52d79c9baaf89116bc4ffa8253a8abd587d0ff +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 92eda59ce85f0c133ad0c1c9fa08aca8accc8b37e544e7e9a75030cf0e566e4591a2a0e16b73c2af11a5722b405b1a5aac3c2df8d71dd9004d141cb479e9ecf3 +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 4235c3fde59117b97d04f8b345bc8403337dd8a8f4fca96bfa50b687da5b43ac528f8d0c0787b263f3775abdc6beacf87b80cf150f3f0098c7f20071aacc8e9c