3.10-stable patches

added patches:
	scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch

diff --git a/queue-3.10/scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch b/queue-3.10/scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch
new file mode 100644 (file)
index 0000000..e21071d
--- /dev/null
+++ b/queue-3.10/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 <gregkh@linuxfoundation.org>
+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 <gregkh@linuxfoundation.org>
+
+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 <gregkh@linuxfoundation.org>
+Acked-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
+Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+
+---
+ 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.10/series b/queue-3.10/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3b6672af4158bfaeed2a34c0e922b20d23629974 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -0,0 +1 @@
+scsi-allow-mpt-fusion-sas-3.0-driver-to-be-built-into-the-kernel.patch