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@xxxxxxxxxxxxxxxx
Attachment:
pgpW3LulbTBHO.pgp
Description: PGP signature
