Compare commits

..

No commits in common. "ed124c85b2364b7d3abceb79fbba6e3155714d4a" and "4d5310f652ca249c47f4d21dd2d631a18bdd34e1" have entirely different histories.

2 changed files with 8 additions and 13 deletions

View File

@ -1,18 +1,18 @@
From a84c0fed2a608f271056c7ac33abfcd276929a70 Mon Sep 17 00:00:00 2001 From 8cf73633b3209471b169913199b79c4d1c2170b4 Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org> From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Tue, 28 May 2024 09:47:52 +0000 Date: Mon, 8 Apr 2024 17:49:33 +0000
Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained Subject: [PATCH] Enable all disabled pci devices by moving to unmaintained
list list
--- ---
kernel/rh_messages.h | 66 ++++++++++++++++++++++---------------------- kernel/rh_messages.h | 64 ++++++++++++++++++++++----------------------
1 file changed, 33 insertions(+), 33 deletions(-) 1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h
index 2ae3f94ad..52555dbbf 100644 index 5b7570edb..12a3523e4 100644
--- a/kernel/rh_messages.h --- a/kernel/rh_messages.h
+++ b/kernel/rh_messages.h +++ b/kernel/rh_messages.h
@@ -121,6 +121,39 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = { @@ -119,6 +119,38 @@ static const struct pci_device_id rh_deprecated_pci_devices[] = {
}; };
static const struct pci_device_id rh_disabled_pci_devices[] = { static const struct pci_device_id rh_disabled_pci_devices[] = {
@ -31,7 +31,6 @@ index 2ae3f94ad..52555dbbf 100644
+ { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID },
+ { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID },
@ -52,7 +51,7 @@ index 2ae3f94ad..52555dbbf 100644
{ 0x1011, 0x0046, 0x103c, 0x10c2 }, { 0x1011, 0x0046, 0x103c, 0x10c2 },
{ 0x1011, 0x0046, 0x9005, 0x0364 }, { 0x1011, 0x0046, 0x9005, 0x0364 },
{ 0x1011, 0x0046, 0x9005, 0x0365 }, { 0x1011, 0x0046, 0x9005, 0x0365 },
@@ -273,37 +306,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = { @@ -272,36 +304,4 @@ static const struct pci_device_id rh_disabled_pci_devices[] = {
{0} /* Terminating entry */ {0} /* Terminating entry */
}; };
@ -68,7 +67,6 @@ index 2ae3f94ad..52555dbbf 100644
- { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID },
- { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID },
- { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, - { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID },

View File

@ -2468,17 +2468,14 @@ BuildKernel() {
# RHEL/CentOS specific .SBAT entries # RHEL/CentOS specific .SBAT entries
%if 0%{?centos} %if 0%{?centos}
SBATsuffix="rhel" SBATsuffix="centos"
%else %else
SBATsuffix="rhel" SBATsuffix="rhel"
%endif %endif
SBAT=$(cat <<- EOF SBAT=$(cat <<- EOF
linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
linux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com
linux.almalinux,1,AlmaLinux,linux,$KernelVer,mailto:security@almalinux.org
kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com
kernel-uki-virt.almalinux,1,AlmaLinux,kernel-uki-virt,$KernelVer,mailto:security@almalinux.org
EOF EOF
) )