Stephen, If you are waiting for ACK, then please carry the fix with my ACK signature. Thanks, Kashyap -----Original Message----- From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] Sent: Monday, September 07, 2009 11:54 AM To: Jiri Kosina Cc: linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Kashyap@xxxxxxxxxxxxxx; Desai, Kashyap; James Bottomley; Uwe Kleine-Koenig Subject: linux-next: manual merge of the trivial tree with the scsi tree Hi Jiri, Today's linux-next merge of the trivial tree got a conflict in drivers/scsi/mpt2sas/mpt2sas_scsih.c between commit 155dd4c763694222c125e65438d823f58ea653bc ("[SCSI] mpt2sas: Prevent sending command to FW while Host Reset") from the scsi tree and commit 8eaa1cbfd596aeb0d2fec7706faccab42eb4bf62 ("trivial: fix typos "man[ae]g? ment" -> "management"") from the trivial tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. Jiri, maybe the scsi part of that trivial patch could be sent to the scsi maintainer. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/scsi/mpt2sas/mpt2sas_scsih.c index 774b345,e849fc7..0000000 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c @@@ -2584,11 -2633,14 +2584,11 @@@ _scsih_qcmd(struct scsi_cmnd *scmd, voi return 0; } - /* see if we are busy with task managment stuff */ + /* see if we are busy with task management stuff */ - spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags); - if (sas_target_priv_data->tm_busy || - ioc->shost_recovery || ioc->ioc_link_reset_in_progress) { - spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags); + if (sas_target_priv_data->tm_busy) + return SCSI_MLQUEUE_DEVICE_BUSY; + else if (ioc->shost_recovery || ioc->ioc_link_reset_in_progress) return SCSI_MLQUEUE_HOST_BUSY; - } - spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags); if (scmd->sc_data_direction == DMA_FROM_DEVICE) mpi_control = MPI2_SCSIIO_CONTROL_READ; -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
