linux-kernel - linux-next: manual merge of the trivial tree with the scsi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20090907162349.3b3337e3.sfr@canb.auug.org.au>
Date:	Mon, 7 Sep 2009 16:23:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kashyap@...r.kernel.org, Desai <kashyap.desai@....com>,
	James Bottomley <James.Bottomley@...e.de>,
	Uwe Kleine-Koenig <u.kleine-koenig@...gutronix.de>
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@...b.auug.org.au

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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/