- Pull stable patches

SOURCES/0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch

@@ -0,0 +1,32 @@
+From 5c3f4066462a5f6cac04d3dd81c9f551fabbc6c7 Mon Sep 17 00:00:00 2001
+From: Keith Busch <kbusch@kernel.org>
+Date: Thu, 12 Oct 2023 11:13:51 -0700
+Subject: [PATCH] nvme-pci: add BOGUS_NID for Intel 0a54 device
+
+These ones claim cmic and nmic capable, so need special consideration to ignore
+their duplicate identifiers.
+
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=217981
+Reported-by: welsh@cassens.com
+Signed-off-by: Keith Busch <kbusch@kernel.org>
+---
+ drivers/nvme/host/pci.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
+index 347cb5daebc3..3f0c9ee09a12 100644
+--- a/drivers/nvme/host/pci.c
++++ b/drivers/nvme/host/pci.c
+@@ -3329,7 +3329,8 @@ static const struct pci_device_id nvme_id_table[] = {
+ 	{ PCI_VDEVICE(INTEL, 0x0a54),	/* Intel P4500/P4600 */
+ 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
+ 				NVME_QUIRK_DEALLOCATE_ZEROES |
+-				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
++				NVME_QUIRK_IGNORE_DEV_SUBNQN |
++				NVME_QUIRK_BOGUS_NID, },
+ 	{ PCI_VDEVICE(INTEL, 0x0a55),	/* Dell Express Flash P4600 */
+ 		.driver_data = NVME_QUIRK_STRIPE_SIZE |
+ 				NVME_QUIRK_DEALLOCATE_ZEROES, },
+-- 
+2.27.0
+

SPECS/kernel.spec

@@ -646,10 +646,6 @@ Requires: kernel-modules-core-uname-r = %{KVERREL}
 Provides: installonlypkg(kernel)
 %endif
 
-Provides: almalinux(kernel-sig-key) = 202303
-Conflicts: shim-ia32 <= 15.6-1.el9.alma
-Conflicts: shim-x64 <= 15.6-1.el9.alma
-
 #
 # List the packages used during the kernel build
 #
@@ -962,6 +958,9 @@ Source4002: gating.yaml
 Patch1: patch-%{patchversion}-redhat.patch
 %endif
 
+# AlmaLinux patches
+Patch1001: 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch
+
 # Bring back deprecated PCI ids #CFHack #CFHack2024
 Patch2001: 0001-Bring-back-deprecated-pci-ids-to-mpt3sas-driver.patch
 Patch2002: 0002-Bring-back-deprecated-pci-ids-to-megaraid_sas-driver.patch
@@ -1482,6 +1481,11 @@ Provides: installonlypkg(kernel)\
 Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
 Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
 %endif\
+%if "%{1}" == "rt" || "%{?1}" == ""\
+Provides: almalinux(kernel-sig-key) = 202303\
+Conflicts: shim-ia32 <= 15.6-1.el9.alma\
+Conflicts: shim-x64 <= 15.6-1.el9.alma\
+%endif\
 %{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
 %if %{?1:1} %{!?1:0} \
 %{expand:%%kernel_meta_package %{?1:%{1}}}\
@@ -1708,6 +1712,8 @@ ApplyOptionalPatch 0006-Bring-back-deprecated-pci-ids-to-qla2xxx-driver.patch
 ApplyOptionalPatch patch-%{patchversion}-redhat.patch
 %endif
 
+ApplyPatch 0001-nvme-pci-add-BOGUS_NID-for-Intel-0a54-device.patch
+
 ApplyOptionalPatch linux-kernel-test.patch
 
 # END OF PATCH APPLICATIONS
@@ -3763,13 +3769,14 @@ fi
 #
 #
 %changelog
-* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [5.14.0-427.el9_3]
+* Sat Mar 16 2024 Andrew Lukoshko <alukoshko@almalinux.org> [5.14.0-427.el9]
 - aacraid: bring back deprecated PCI ids #CFHack #CFHack2024
 - hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
 - mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
 - mpt3sas: bring back deprecated PCI ids #CFHack #CFHack2024
 - megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
 - qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024
+- - nvme-pci: add BOGUS_NID for Intel 0a54 device
 
 * Thu Feb 22 2024 Scott Weaver <scweaver@redhat.com> [5.14.0-427.el9]
 - scsi: smartpqi: Fix disable_managed_interrupts (Tomas Henzl) [RHEL-26145]