remove scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch from .31 and ...

diff --git a/queue-2.6.31/scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch b/queue-2.6.31/scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch
deleted file mode 100644 (file)
index 3c8e066..0000000
--- a/queue-2.6.31/scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d685c262083dcd5fd98b7499b22a377a3225229c Mon Sep 17 00:00:00 2001
-From: Kashyap, Desai <kashyap.desai@lsi.com>
-Date: Tue, 17 Nov 2009 13:16:37 +0530
-Subject: SCSI: mpt2sas: add missing initialization of scsih_cmds
-
-From: Kashyap, Desai <kashyap.desai@lsi.com>
-
-commit d685c262083dcd5fd98b7499b22a377a3225229c upstream.
-
-Internal command scsih_cmds init is included in mpt2sas_base_attach.
-
-Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
-Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/scsi/mpt2sas/mpt2sas_base.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/scsi/mpt2sas/mpt2sas_base.c
-+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
-@@ -3302,6 +3302,11 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPT
-       mutex_init(&ioc->transport_cmds.mutex);
-       init_completion(&ioc->transport_cmds.done);
- 
-+      /* scsih internal command bits */
-+      ioc->scsih_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
-+      ioc->scsih_cmds.status = MPT2_CMD_NOT_USED;
-+      mutex_init(&ioc->scsih_cmds.mutex);
-+
-       /* task management internal command bits */
-       ioc->tm_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
-       ioc->tm_cmds.status = MPT2_CMD_NOT_USED;

diff --git a/queue-2.6.31/series b/queue-2.6.31/series
index 1a98c5f9316b4b7854b83201e5a030ffb4b72b51..d2787027eeede314b2c384b713349a8d31a367f1 100644 (file)
--- a/queue-2.6.31/series
+++ b/queue-2.6.31/series
@@ -10,7 +10,6 @@ md-fix-unfortunate-interaction-with-evms.patch
 pata_cmd64x-fix-overclocking-of-udma0-2-modes.patch
 pata_hpt3x2n-fix-clock-turnaround.patch
 scsi-fc-class-fix-fc_transport_init-error-handling.patch
-scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch
 sound-sgio2audio-pdaudiocf-usb-audio-initialize-pcm-buffer.patch
 usb-emi62-fix-crash-when-trying-to-load-emi-6-2-firmware.patch
 usb-fix-a-bug-on-appledisplay.c-regarding-signedness.patch

diff --git a/queue-2.6.32/scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch b/queue-2.6.32/scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch
deleted file mode 100644 (file)
index 9f9b894..0000000
--- a/queue-2.6.32/scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d685c262083dcd5fd98b7499b22a377a3225229c Mon Sep 17 00:00:00 2001
-From: Kashyap, Desai <kashyap.desai@lsi.com>
-Date: Tue, 17 Nov 2009 13:16:37 +0530
-Subject: SCSI: mpt2sas: add missing initialization of scsih_cmds
-
-From: Kashyap, Desai <kashyap.desai@lsi.com>
-
-commit d685c262083dcd5fd98b7499b22a377a3225229c upstream.
-
-Internal command scsih_cmds init is included in mpt2sas_base_attach.
-
-Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
-Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
---- a/drivers/scsi/mpt2sas/mpt2sas_base.c
-+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
-@@ -3583,6 +3583,11 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
-       ioc->transport_cmds.status = MPT2_CMD_NOT_USED;
-       mutex_init(&ioc->transport_cmds.mutex);
- 
-+      /* scsih internal command bits */
-+      ioc->scsih_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
-+      ioc->scsih_cmds.status = MPT2_CMD_NOT_USED;
-+      mutex_init(&ioc->scsih_cmds.mutex);
-+
-       /* task management internal command bits */
-       ioc->tm_cmds.reply = kzalloc(ioc->reply_sz, GFP_KERNEL);
-       ioc->tm_cmds.status = MPT2_CMD_NOT_USED;

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 5a8d8972ff56ddb444ba51d2fdb4e8f1bf4b3803..9ef4a11a474da803433dd470834665760b532cfb 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -2,7 +2,6 @@ scsi-ipr-fix-eeh-recovery.patch
 scsi-qla2xxx-dpc-thread-can-execute-before-scsi-host-has-been-added.patch
 scsi-st-fix-mdata-page_order-handling.patch
 scsi-fc-class-fix-fc_transport_init-error-handling.patch
-scsi-mpt2sas-add-missing-initialization-of-scsih_cmds.patch
 sched-fix-task_hot-test-order.patch
 x86-cpuid-add-volatile-to-asm-in-native_cpuid.patch
 sched-select_task_rq_fair-must-honour-sd_load_balance.patch