diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:31:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-24 05:56:43 +0200 |
commit | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (patch) | |
tree | 5a62f9127c7daa3d8f96e1394ef74421a7fb53e7 /0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch | |
parent | 536dec0b3393550051e61fc345aede447477bf94 (diff) | |
parent | d1b6f8c7af0eb9a0a44b2d4723e58dde5eafa236 (diff) | |
download | kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.tar.gz kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.tar.xz kernel-837cd03f031f1daaa2dda23d584cda25b0dfd51e.zip |
merge masterkernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc33kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc32kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc31kernel-5.7.0-0.rc2.20200423git7adc4b399952.1.vanilla.1.fc30
Diffstat (limited to '0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch')
-rw-r--r-- | 0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch new file mode 100644 index 000000000..d346699e1 --- /dev/null +++ b/0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch @@ -0,0 +1,51 @@ +From 1452b94264d571fe1675845b9947199539052275 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 + +Author: Tomas Henzl <thenzl@redhat.com> +Date: Thu Jan 10 16:11:43 2019 -0500 + + [message] mptspi: Taint kernel if mptspi is loaded + + Message-id: <20190110161145.5117-2-thenzl@redhat.com> + Patchwork-id: 237188 + O-Subject: [RHEL-8.0 e-stor 1/3] mptspi: Taint kernel if mptspi is loaded + Bugzilla: 1651803 + RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com> + RH-Acked-by: Jarod Wilson <jarod@redhat.com> + RH-Acked-by: Chris Leech <cleech@redhat.com> + + RHEL-only + We are only keeping it to ease developer transitions, we're not + supporting it, so mark it as unsupported by tainting the kernel and + issuing an impossible to misunderstand message to the log + + Signed-off-by: Herton R. Krzesinski <herton@redhat.com> + +Upstream Status: RHEL only +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + drivers/message/fusion/mptspi.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c +index eabc4de5816c..c028f5944694 100644 +--- a/drivers/message/fusion/mptspi.c ++++ 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 ++ add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK); ++ pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n"); ++#endif ++ + return 0; + + out_mptspi_probe: +-- +2.26.0 + |