diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-04-26 21:15:20 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-04-26 21:15:20 -0500 |
commit | 6c2cc50051831fa502a8b082a312ca90e7039f3f (patch) | |
tree | bb474cc356d09fb7963eadaeb127a00f7fed6531 /0001-mptsas-pci-id-table-changes.patch | |
parent | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff) | |
download | kernel-6c2cc50051831fa502a8b082a312ca90e7039f3f.tar.gz kernel-6c2cc50051831fa502a8b082a312ca90e7039f3f.tar.xz kernel-6c2cc50051831fa502a8b082a312ca90e7039f3f.zip |
kernel-5.7.0-0.rc3.1
* Sun Apr 26 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.1]
- v5.7-rc3 rebase
- Add cec to the filter overrides ("Justin M. Forbes")
- Add overrides to filter-modules.sh ("Justin M. Forbes")
- Adjust the changelog update script to not push anything (Jeremy Cline)
- Drop --target noarch from the rh-rpms make target (Jeremy Cline)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-mptsas-pci-id-table-changes.patch')
-rw-r--r-- | 0001-mptsas-pci-id-table-changes.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-mptsas-pci-id-table-changes.patch b/0001-mptsas-pci-id-table-changes.patch index ed02cf9ad..258d25981 100644 --- a/0001-mptsas-pci-id-table-changes.patch +++ b/0001-mptsas-pci-id-table-changes.patch @@ -1,4 +1,4 @@ -From 17b7b240a30ab7342db5e2853d13a41fb88bf2ee Mon Sep 17 00:00:00 2001 +From 8e0c371236b954161a34286a11267e8627cc76a4 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Thu, 2 Jan 2020 14:24:47 -0500 Subject: [PATCH] mptsas: pci-id table changes @@ -36,7 +36,7 @@ index c17614cd6ed8..ca44a35ec411 100644 +++ b/drivers/message/fusion/mptsas.c @@ -5358,6 +5358,10 @@ static void mptsas_remove(struct pci_dev *pdev) } - + static struct pci_device_id mptsas_pci_table[] = { +#ifdef CONFIG_RHEL_DIFFERENCES + { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068, @@ -54,5 +54,5 @@ index c17614cd6ed8..ca44a35ec411 100644 }; MODULE_DEVICE_TABLE(pci, mptsas_pci_table); -- -2.26.0 +2.26.2 |