4.15-stable patches

added patches:
	scsi-smartpqi-allow-static-build-built-in.patch

diff --git a/queue-4.15/scsi-smartpqi-allow-static-build-built-in.patch b/queue-4.15/scsi-smartpqi-allow-static-build-built-in.patch
new file mode 100644 (file)
index 0000000..7dc8df8
--- /dev/null
+++ b/queue-4.15/scsi-smartpqi-allow-static-build-built-in.patch
@@ -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

diff --git a/queue-4.15/series b/queue-4.15/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a816348d2976ab99dd6edbecd0c3db75c0f4984a 100644 (file)
--- a/queue-4.15/series
+++ b/queue-4.15/series
@@ -0,0 +1 @@
+scsi-smartpqi-allow-static-build-built-in.patch