]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Feb 2018 13:42:16 +0000 (14:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Feb 2018 13:42:16 +0000 (14:42 +0100)
added patches:
scsi-smartpqi-allow-static-build-built-in.patch

queue-4.14/scsi-smartpqi-allow-static-build-built-in.patch [new file with mode: 0644]
queue-4.14/series
queue-4.4/series [new file with mode: 0644]

diff --git a/queue-4.14/scsi-smartpqi-allow-static-build-built-in.patch b/queue-4.14/scsi-smartpqi-allow-static-build-built-in.patch
new file mode 100644 (file)
index 0000000..7dc8df8
--- /dev/null
@@ -0,0 +1,26 @@
+From dc2db1dc5fb9ab3a43b305c2720fee5278dbee2a Mon Sep 17 00:00:00 2001
+From: Steffen Weber <steffen.weber@gmail.com>
+Date: Tue, 2 Jan 2018 19:24:09 +0100
+Subject: scsi: smartpqi: allow static build ("built-in")
+
+From: Steffen Weber <steffen.weber@gmail.com>
+
+commit dc2db1dc5fb9ab3a43b305c2720fee5278dbee2a upstream.
+
+If CONFIG_SCSI_SMARTPQI=y then don't build this driver as a module.
+
+Signed-off-by: Steffen Weber <steffen.weber@gmail.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/smartpqi/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/smartpqi/Makefile
++++ b/drivers/scsi/smartpqi/Makefile
+@@ -1,3 +1,3 @@
+ ccflags-y += -I.
+-obj-m         += smartpqi.o
++obj-$(CONFIG_SCSI_SMARTPQI) += smartpqi.o
+ smartpqi-objs := smartpqi_init.o smartpqi_sis.o smartpqi_sas_transport.o
index 372b72b88c1a80981cc2fbd10b82d1d67329fc37..f9cddcf1e31ee3df5224ef51d30e103f659224b0 100644 (file)
@@ -1 +1,2 @@
 tracing-prevent-profile_all_branches-when-fortify_source-y.patch
+scsi-smartpqi-allow-static-build-built-in.patch
diff --git a/queue-4.4/series b/queue-4.4/series
new file mode 100644 (file)
index 0000000..e69de29