Hi James, Today's linux-next merge of the scsi tree got a conflict in drivers/scsi/scsi_wait_scan.c between commit eea03c20ae38 ("Make wait_for_device_probe() also do scsi_complete_async_scans()") from Linus' tree and commit 01444e1106cb ("[SCSI] Remove scsi_wait_scan module") from the scsi tree. I just removed the file. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpk7ubTxUbUv.pgp
Description: PGP signature