diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-27 19:48:54 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-27 19:48:54 +0200 |
commit | be305682f0f037608ba1884e677c56d30877d699 (patch) | |
tree | 53a33b12b4434182720920a9da81e27d2d40c7ed /0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch | |
parent | 8646321dee2344a7d6b8c53bc1694c23d6992fe8 (diff) | |
parent | 13bd6da63cf611a8325774f77a657cf8a6a0fc66 (diff) | |
download | kernel-be305682f0f037608ba1884e677c56d30877d699.tar.gz kernel-be305682f0f037608ba1884e677c56d30877d699.tar.xz kernel-be305682f0f037608ba1884e677c56d30877d699.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.20200827git15bc20c6af4c.1.vanilla.2.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 aab99d905..0fa4720e6 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 6a79cd0ebe2b..c17614cd6ed8 100644 +index 18b91ea1a353..38d8b2bb3a37 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) |