From: Greg Kroah-Hartman Date: Mon, 16 Sep 2013 16:24:13 +0000 (-0700) Subject: 3.11-stable patches X-Git-Tag: v3.0.97~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2458dacc846eaf210fe3b5f47dd4bac4a28fcc86;p=thirdparty%2Fkernel%2Fstable-queue.git 3.11-stable patches added patches: scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch --- diff --git a/queue-3.11/scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch b/queue-3.11/scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch new file mode 100644 index 00000000000..e21071da44b --- /dev/null +++ b/queue-3.11/scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch @@ -0,0 +1,30 @@ +From 9807b4d94911be4e4efb9a08481b24292a9edf8a Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 3 Sep 2013 15:00:11 -0700 +Subject: SCSI: Allow MPT Fusion SAS 3.0 driver to be built into the kernel + +From: Greg Kroah-Hartman + +commit 9807b4d94911be4e4efb9a08481b24292a9edf8a upstream. + +Right now the Makefile for the mpt3sas driver does not even allow the +driver to be built into the kernel. So fix that up, as there doesn't +seem to be any obvious reason why this shouldn't be done. + +Signed-off-by: Greg Kroah-Hartman +Acked-by: Sreekanth Reddy +Signed-off-by: James Bottomley + +--- + drivers/scsi/mpt3sas/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/mpt3sas/Makefile ++++ b/drivers/scsi/mpt3sas/Makefile +@@ -1,5 +1,5 @@ + # mpt3sas makefile +-obj-m += mpt3sas.o ++obj-$(CONFIG_SCSI_MPT3SAS) += mpt3sas.o + mpt3sas-y += mpt3sas_base.o \ + mpt3sas_config.o \ + mpt3sas_scsih.o \ diff --git a/queue-3.11/series b/queue-3.11/series index 261ea6fc8aa..c17b9ec7b18 100644 --- a/queue-3.11/series +++ b/queue-3.11/series @@ -1,3 +1,4 @@ arc-smp-failed-to-boot-due-to-missing-ivt-setup.patch ipc-msg.c-fix-lost-wakeup-in-msgsnd.patch xtensa-fix-broken-allmodconfig-build.patch +scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch