summaryrefslogtreecommitdiffstats
path: root/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-04-26 21:15:20 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-04-26 21:15:20 -0500
commit6c2cc50051831fa502a8b082a312ca90e7039f3f (patch)
treebb474cc356d09fb7963eadaeb127a00f7fed6531 /0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
parentd1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff)
downloadkernel-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-mptspi-Taint-kernel-if-mptspi-is-loaded.patch')
-rw-r--r--0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
index d346699e1..ae184a89c 100644
--- a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
+++ b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch
@@ -1,4 +1,4 @@
-From 1452b94264d571fe1675845b9947199539052275 Mon Sep 17 00:00:00 2001
+From 3535a5346cbb8131444887a2ea224f2d31eaaa26 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@redhat.com>
Date: Thu, 2 Jan 2020 14:24:48 -0500
Subject: [PATCH] mptspi: Taint kernel if mptspi is loaded
@@ -35,7 +35,7 @@ index eabc4de5816c..c028f5944694 100644
+++ b/drivers/message/fusion/mptspi.c
@@ -1534,6 +1534,12 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
0, 0, 0, 0, 5);
-
+
scsi_scan_host(sh);
+
+#ifdef CONFIG_RHEL_DIFFERENCES
@@ -44,8 +44,8 @@ index eabc4de5816c..c028f5944694 100644
+#endif
+
return 0;
-
+
out_mptspi_probe:
--
-2.26.0
+2.26.2