diff --git a/Makefile.rhelver b/Makefile.rhelver index 9826d97f6..931d6835d 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 = 51 +RHEL_RELEASE = 54 # # RHEL_REBASE_NUM diff --git a/kernel.spec b/kernel.spec index 2f81be4ee..b73d5543a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.6.0 %define specversion 6.6.0 %define patchversion 6.6 -%define pkgrelease 0.rc6.20231020gitce55c22ec8b2.51 +%define pkgrelease 0.rc7.54 %define kversion 6 -%define tarfile_release 6.6-rc6-182-gce55c22ec8b2 +%define tarfile_release 6.6-rc7 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20231020gitce55c22ec8b2.51%{?buildid}%{?dist} +%define specrelease 0.rc7.54%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.6.0 @@ -3709,6 +3709,15 @@ fi\ # # %changelog +* Mon Oct 23 2023 Fedora Kernel Team [6.6.0-0.rc7.54] +- Linux v6.6.0-0.rc7 + +* Sun Oct 22 2023 Fedora Kernel Team [6.6.0-0.rc6.1acfd2bd3f0d.53] +- Linux v6.6.0-0.rc6.1acfd2bd3f0d + +* Sat Oct 21 2023 Fedora Kernel Team [6.6.0-0.rc6.9c5d00cb7b6b.52] +- Linux v6.6.0-0.rc6.9c5d00cb7b6b + * Fri Oct 20 2023 Fedora Kernel Team [6.6.0-0.rc6.ce55c22ec8b2.51] - redhat/configs: share CONFIG_ARM64_ERRATUM_2966298 between rhel and fedora (Mark Salter) - configs: Remove S390 IOMMU config options that no longer exist (Jerry Snitselaar) diff --git a/patch-6.6-redhat.patch b/patch-6.6-redhat.patch index 30c66fca2..fb736634b 100644 --- a/patch-6.6-redhat.patch +++ b/patch-6.6-redhat.patch @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index a3e52e10840e..329dd7b06695 100644 +index 5fc735c7fed1..46bc07b7a4b5 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -379,10 +379,10 @@ index 6aef1ee5e1bd..8f146b1b4972 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index c2c786eb95ab..4e3aa80cd5cf 100644 +index 1687483ff319..390b67f19181 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c -@@ -138,6 +138,7 @@ struct acpi_irq_parse_one_ctx { +@@ -143,6 +143,7 @@ struct acpi_irq_parse_one_ctx { unsigned int index; unsigned long *res_flags; struct irq_fwspec *fwspec; @@ -390,7 +390,7 @@ index c2c786eb95ab..4e3aa80cd5cf 100644 }; /** -@@ -211,7 +212,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, +@@ -216,7 +217,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, return AE_CTRL_TERMINATE; case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: eirq = &ares->data.extended_irq; @@ -400,7 +400,7 @@ index c2c786eb95ab..4e3aa80cd5cf 100644 return AE_OK; if (ctx->index >= eirq->interrupt_count) { ctx->index -= eirq->interrupt_count; -@@ -247,8 +249,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, +@@ -252,8 +254,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, static int acpi_irq_parse_one(acpi_handle handle, unsigned int index, struct irq_fwspec *fwspec, unsigned long *flags) { @@ -544,7 +544,7 @@ index e489fefd23da..f2dfae764fb5 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index ce20a60676f0..3cbe5c720e5c 100644 +index 1974f0ad32ba..6ba6391494ec 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -32,6 +32,7 @@ @@ -555,7 +555,7 @@ index ce20a60676f0..3cbe5c720e5c 100644 #include -@@ -979,40 +980,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -983,40 +984,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif @@ -1562,7 +1562,7 @@ index e1aa667dae66..32e3b2683f2f 100644 /* Fusion */ {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index c3c1f466fe01..370efec15191 100644 +index 605013d3ee83..59d7ac663316 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c @@ -12617,6 +12617,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) @@ -1594,7 +1594,7 @@ index c3c1f466fe01..370efec15191 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 50db08265c51..5ece5ffc3944 100644 +index dcae09a37d49..83a9a522cf8a 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -8113,6 +8113,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { diff --git a/sources b/sources index fef189edb..0eabfc7a2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.6-rc6-182-gce55c22ec8b2.tar.xz) = 71e065807756f1357e00150f868128e5c7b60124888cd265f427d795976fea1530d328d34c2e3a16009bb060acbdacee90055171aa4303214102a31467ffce57 -SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 7d772b3b3a8def36f51abbd18d602d7ac5b179c7a24c7a71ccd44d17b498145c9debdaf84fd81330e45456807ea9825ea9b08ae26b1ce627c13cdf8f0c8be4f1 -SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = f802c4ce8153b45c9dc70798487dbaf6ef04c006662151284e0926f9d6ffe96dbb930e64ca2ec539cda27e9135b96c010cbf3254079772834b310a4f1f72ed2e +SHA512 (linux-6.6-rc7.tar.xz) = c554605c021dc569a22d5479a0792f5fc23a949a9fb76343ee3594b72514f2950611db69d4f1ab5a8d390ed979fd41a87aee080bbebf78c9cfc882e608ab63e3 +SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 896b1b24617e3a6905c26dd2a50b23ff2e2c7627f6b6dc12b328d5f74109016722b4ba050c5051886cb597308a793366346a34d7ec82a658b646d5288b347ae7 +SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = f98c14408c8434ecd253c6781c4f918cf1497da7bd55a79382fcf9dc67512d48e9357825c99a960616d2a9403d55be46989344cd201f762fd5450a2115e43c2a