From: Greg Kroah-Hartman Date: Sat, 17 Feb 2018 13:42:16 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.15.5~57 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=814507db714c277ea708e35a609a010c8180a60a;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: scsi-smartpqi-allow-static-build-built-in.patch --- 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 index 00000000000..7dc8df8fcc0 --- /dev/null +++ b/queue-4.14/scsi-smartpqi-allow-static-build-built-in.patch @@ -0,0 +1,26 @@ +From dc2db1dc5fb9ab3a43b305c2720fee5278dbee2a Mon Sep 17 00:00:00 2001 +From: Steffen Weber +Date: Tue, 2 Jan 2018 19:24:09 +0100 +Subject: scsi: smartpqi: allow static build ("built-in") + +From: Steffen Weber + +commit dc2db1dc5fb9ab3a43b305c2720fee5278dbee2a upstream. + +If CONFIG_SCSI_SMARTPQI=y then don't build this driver as a module. + +Signed-off-by: Steffen Weber +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman + +--- + 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.14/series b/queue-4.14/series index 372b72b88c1..f9cddcf1e31 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -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 index 00000000000..e69de29bb2d