From 38a71d27938dc0a2bec98994c29681bba5f80263 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 17 Jun 2024 09:26:50 -0600 Subject: [PATCH] kernel-6.10.0-0.rc4.38 * Mon Jun 17 2024 Fedora Kernel Team [6.10.0-0.rc4.38] - Fix SERIAL_SC16IS7XX configs for Fedora (Justin M. Forbes) - Enable ALSA (CONFIG_SND) on aarch64 (Charles Mirabile) [RHEL-40411] - redhat: Remove DIST_BRANCH variable (Eder Zulian) - Linux v6.10.0-0.rc4 Resolves: RHEL-40411 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 5 ++--- kernel-aarch64-16k-fedora.config | 5 ++--- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-fedora.config | 5 ++--- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 5 ++--- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-fedora.config | 5 ++--- kernel-ppc64le-fedora.config | 5 ++--- kernel-s390x-debug-fedora.config | 5 ++--- kernel-s390x-fedora.config | 5 ++--- kernel-x86_64-debug-fedora.config | 5 ++--- kernel-x86_64-fedora.config | 5 ++--- kernel.changelog | 23 +++++++++++++++++++++++ kernel.spec | 24 +++++++++++++++++++++--- patch-6.10-redhat.patch | 16 ++++++++-------- sources | 6 +++--- 21 files changed, 82 insertions(+), 51 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 66dd6c7e7..c2930e3e8 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 = 33 +RHEL_RELEASE = 38 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 539c0f6b4..17c532315 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -7490,10 +7490,9 @@ CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_SH_SCI_DMA=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 4f021fad1..da2dda48d 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -7463,10 +7463,9 @@ CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_SH_SCI_DMA=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 463f071ff..bef0ae711 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -6264,7 +6264,6 @@ CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m -# CONFIG_SND is not set CONFIG_SND_JACK_INJECTION_DEBUG=y CONFIG_SND_JACK=y # CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB is not set @@ -6274,6 +6273,7 @@ CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m +CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index f523b5b91..61e650445 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -6241,7 +6241,6 @@ CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m -# CONFIG_SND is not set # CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_JACK=y # CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB is not set @@ -6251,6 +6250,7 @@ CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m +CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d9b541c38..aeb06e576 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7489,10 +7489,9 @@ CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_SH_SCI_DMA=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 9b2cd5733..39b05bdba 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6260,7 +6260,6 @@ CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m -# CONFIG_SND is not set CONFIG_SND_JACK_INJECTION_DEBUG=y CONFIG_SND_JACK=y # CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB is not set @@ -6270,6 +6269,7 @@ CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m +CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 54bedaed8..3852a1d0f 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7462,10 +7462,9 @@ CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set CONFIG_SERIAL_SAMSUNG_CONSOLE=y CONFIG_SERIAL_SAMSUNG=y -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_SH_SCI_DMA=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b188c58ab..213e0b0e3 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6237,7 +6237,6 @@ CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m -# CONFIG_SND is not set # CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_JACK=y # CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB is not set @@ -6247,6 +6246,7 @@ CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m +CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index d01a085f7..e2850ef9b 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -6313,7 +6313,6 @@ CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m -# CONFIG_SND is not set CONFIG_SND_JACK_INJECTION_DEBUG=y CONFIG_SND_JACK=y # CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB is not set @@ -6323,6 +6322,7 @@ CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m +CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 54d8147df..c53a50fa0 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -6290,7 +6290,6 @@ CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0M is not set # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m -# CONFIG_SND is not set # CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_JACK=y # CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB is not set @@ -6300,6 +6299,7 @@ CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m CONFIG_SND_LOLA=m CONFIG_SND_LX6464ES=m +CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c1463c664..aaa342fe4 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6123,10 +6123,9 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SPRD is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 324cc1dad..976e7df89 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6094,10 +6094,9 @@ CONFIG_SERIAL_NONSTANDARD=y CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SPRD is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 318eae01b..4d9ff5408 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6051,10 +6051,9 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SPRD is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index d80294b6b..050a9ea08 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6022,10 +6022,9 @@ CONFIG_SERIAL_JSM=m # CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SPRD is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 48d467cf1..68ffa15d2 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6581,10 +6581,9 @@ CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SPRD is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d8039ccc8..28d315a04 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6553,10 +6553,9 @@ CONFIG_SERIAL_MULTI_INSTANTIATE=m CONFIG_SERIAL_NONSTANDARD=y # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_RP2 is not set -# CONFIG_SERIAL_SC16IS7XX_CORE is not set -CONFIG_SERIAL_SC16IS7XX_I2C=y +CONFIG_SERIAL_SC16IS7XX_I2C=m CONFIG_SERIAL_SC16IS7XX=m -CONFIG_SERIAL_SC16IS7XX_SPI=y +CONFIG_SERIAL_SC16IS7XX_SPI=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SIFIVE is not set # CONFIG_SERIAL_SPRD is not set diff --git a/kernel.changelog b/kernel.changelog index 84d229b1a..399b6faa8 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,26 @@ +* Mon Jun 17 2024 Fedora Kernel Team [6.10.0-0.rc4.38] +- Fix SERIAL_SC16IS7XX configs for Fedora (Justin M. Forbes) +- Enable ALSA (CONFIG_SND) on aarch64 (Charles Mirabile) [RHEL-40411] +- redhat: Remove DIST_BRANCH variable (Eder Zulian) +- Linux v6.10.0-0.rc4 +Resolves: RHEL-40411 + +* Sun Jun 16 2024 Fedora Kernel Team [6.10.0-0.rc3.a3e18a540541.37] +- Linux v6.10.0-0.rc3.a3e18a540541 +Resolves: + +* Sat Jun 15 2024 Fedora Kernel Team [6.10.0-0.rc3.44ef20baed8e.36] +- Linux v6.10.0-0.rc3.44ef20baed8e +Resolves: + +* Fri Jun 14 2024 Fedora Kernel Team [6.10.0-0.rc3.d20f6b3d747c.35] +- Linux v6.10.0-0.rc3.d20f6b3d747c +Resolves: + +* Thu Jun 13 2024 Fedora Kernel Team [6.10.0-0.rc3.2ccbdf43d5e7.34] +- Linux v6.10.0-0.rc3.2ccbdf43d5e7 +Resolves: + * Wed Jun 12 2024 Fedora Kernel Team [6.10.0-0.rc3.2ef5971ff345.33] - gitlab-ci: merge ark-latest before tagging cki-gating (Michael Hofmann) - Linux v6.10.0-0.rc3.2ef5971ff345 diff --git a/kernel.spec b/kernel.spec index 4cb8b1012..e298ec13e 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.rc3.20240612git2ef5971ff345.33 +%define pkgrelease 0.rc4.38 %define kversion 6 -%define tarfile_release 6.10-rc3-21-g2ef5971ff345 +%define tarfile_release 6.10-rc4 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20240612git2ef5971ff345.33%{?buildid}%{?dist} +%define specrelease 0.rc4.38%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4018,6 +4018,24 @@ fi\ # # %changelog +* Mon Jun 17 2024 Fedora Kernel Team [6.10.0-0.rc4.38] +- Fix SERIAL_SC16IS7XX configs for Fedora (Justin M. Forbes) +- Enable ALSA (CONFIG_SND) on aarch64 (Charles Mirabile) [RHEL-40411] +- redhat: Remove DIST_BRANCH variable (Eder Zulian) +- Linux v6.10.0-0.rc4 + +* Sun Jun 16 2024 Fedora Kernel Team [6.10.0-0.rc3.a3e18a540541.37] +- Linux v6.10.0-0.rc3.a3e18a540541 + +* Sat Jun 15 2024 Fedora Kernel Team [6.10.0-0.rc3.44ef20baed8e.36] +- Linux v6.10.0-0.rc3.44ef20baed8e + +* Fri Jun 14 2024 Fedora Kernel Team [6.10.0-0.rc3.d20f6b3d747c.35] +- Linux v6.10.0-0.rc3.d20f6b3d747c + +* Thu Jun 13 2024 Fedora Kernel Team [6.10.0-0.rc3.2ccbdf43d5e7.34] +- Linux v6.10.0-0.rc3.2ccbdf43d5e7 + * Wed Jun 12 2024 Fedora Kernel Team [6.10.0-0.rc3.2ef5971ff345.33] - gitlab-ci: merge ark-latest before tagging cki-gating (Michael Hofmann) - Linux v6.10.0-0.rc3.2ef5971ff345 diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index e0ea74321..0e4e2f7be 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 925a75b8ba7d..2d4c5b9dde83 100644 +index 14427547dc1e..b1f4e2e3d18e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1714,7 +1714,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 f5d150c62955..e79f29406916 100644 +index 782090ce0bc1..989011902b13 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -261,6 +261,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2087,10 +2087,10 @@ index 88acefbf9aea..bf57fd3b9263 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 12d08d8ba538..6717350768e4 100644 +index 870ec2cb4af4..21af6aff16ee 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -12598,6 +12598,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) +@@ -12575,6 +12575,7 @@ scsih_pci_mmio_enabled(struct pci_dev *pdev) * The pci device ids are defined in mpi/mpi2_cnfg.h. */ static const struct pci_device_id mpt3sas_pci_table[] = { @@ -2098,7 +2098,7 @@ index 12d08d8ba538..6717350768e4 100644 /* Spitfire ~ 2004 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12616,6 +12617,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12593,6 +12594,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, PCI_ANY_ID, PCI_ANY_ID }, @@ -2106,7 +2106,7 @@ index 12d08d8ba538..6717350768e4 100644 /* Thunderbolt ~ 2208 */ { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, PCI_ANY_ID, PCI_ANY_ID }, -@@ -12640,9 +12642,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { +@@ -12617,9 +12619,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { PCI_ANY_ID, PCI_ANY_ID }, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, PCI_ANY_ID, PCI_ANY_ID }, @@ -2170,7 +2170,7 @@ index 17cccd14765f..7f0cef737224 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index f6c822c9cbd2..db17a2d5173b 100644 +index 37dd6ead72a4..31d7f80cd2d7 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -119,6 +119,14 @@ static const char *sd_cache_types[] = { @@ -2188,7 +2188,7 @@ index f6c822c9cbd2..db17a2d5173b 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4242,6 +4250,11 @@ static int __init init_sd(void) +@@ -4249,6 +4257,11 @@ static int __init init_sd(void) goto err_out_class; } diff --git a/sources b/sources index a488113ee..c6cb95cc3 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-rc3-21-g2ef5971ff345.tar.xz) = 7d9b15b3839905a10c7fb08b7fffa4e14780c355526be770262d0a9b13a04423c13c497cb9e6d4394d340cf99a69e09686853639ef7a9d9eee8f87215ab632be -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 377efcdb557b59576d3603640a0c1f541537f68ada98cff45d0bdc24d2156b1f473b6f4140829c860a426caa1dd798934d766f4391602955abe7a5b5a7f8c6b6 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 66feacd3ff8520dcfdac330d02a881ef161a3a21d7b5dfd218d0d35d0f75f6c289dd0cc79638192db536184cab121c734d22667987a2669f9091fd70612fc710 +SHA512 (linux-6.10-rc4.tar.xz) = ebef99f83050846ace276c93b6e9d210b9616d5ff4170c1b052d2c91020ebcb477fe28645cd1cee4b039291ca3cae2100e35a95f57290ae0a936b5b0ec60ba74 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 9bfd46a4fcb4170fa1ee938d7e63366e15769d105a9fe8b3f51aa5aa26d4fd9992e7629d9ac1ef445da52cfd0d435f8da62c7a28b611e998bba805de334635ca +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 19bbd9ea7fa4221e46f4c6962f0cbdb5e9de5625314cc165a1124f677c45ea7552b23c73a724663ab53565b72a9117337ed8c33d9265d126d8b101c18830f3b3