On Mon, 2005-10-31 at 09:13 -0800, Mark Haverkamp wrote: > I updated my local scsi-misc-2.6 tree today and had merge conflicts > somehow. The tree had not been previously locally modified and was up > to date as of last week. I used the cg-update command to perform the > update. After receiving the changes it got a merge conflict: > > Applying changes... > Merging fe607aa94f5d25ee84f9a9a4fdf2cce3765e12e4 -> d078650986b117520f2b10cb72c04bc1904e3ba7 > to a25bbd9e2f6c6907672301fe934a8f9989e60330... > ... Auto-merging drivers/scsi/scsi_scan.c > merge: warning: conflicts during merge My best guess is that your merge programme is confused. I've had to merge the tree up several times to fix conflicts, but it's the same tree. It looks like whatever tool you used to merge failed to recognise this. James - : send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
