Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/scsi/sd.c between commit 21208ae5a21f ("[SCSI] sd: remove
arbitrary SD_MAX_DISKS namespace limit") from the scsi tree and
"drivers/scsi/sd.c: use ida_simple_get() and ida_simple_remove() in place
of boilerplate code" from the akpm.
I think that the latter supercedes that former, so I used it.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpAaz67P6W8r.pgp
Description: PGP signature
