diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch | |
parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
Diffstat (limited to '0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch')
-rw-r--r-- | 0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch b/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch index acf088c66..14bf0fb3e 100644 --- a/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch +++ b/0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch @@ -31,7 +31,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com> 1 file changed, 5 insertions(+) diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c -index 18b91ea1a353..38d8b2bb3a37 100644 +index 6a79cd0ebe2b..c17614cd6ed8 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c @@ -5290,6 +5290,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id) |