Re: 2.6.7-rc2-mm1

Andrew Morton
2004-06-02T10:24:37Z

Paul Jackson <pj@sgi.com> wrote:
>
> Just guessing, the problem is likely in the bk-scsi.patch, which seems
> to be signed off by James Bottomley, and handled by or originated from
> Markus Lidel and various others. This is the only patch in Andrew's
> 2.6.7-rc2-mm1 that touches files matching drivers/scsi/sr*.

No, it's all due to my hamfisted attempt to resolve various bk conflicts.
Don't choose "merge using sccs algorithm".