linux-kernel - linux-next: manual merge of the isci 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>] [day] [month] [year] [list]

Date:	Fri, 18 May 2012 12:10:27 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dan Williams <dan.j.williams@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	James Bottomley <James.Bottomley@...senPartnership.com>
Subject: linux-next: manual merge of the isci tree with the scsi tree

Hi Dan,

Today's linux-next merge of the isci tree got a conflict in
drivers/scsi/scsi.c between commit a7a20d103994 ("[SCSI] sd: limit the
scope of the async probe domain") from the scsi tree and commit
2eae65b32c9b ("scsi, sd: limit the scope of the async probe domain") from
the isci tree.

I used the version from the scsi tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped