lkml.org 
[lkml]   [2004]   [Jun]   [2]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
/
DateWed, 2 Jun 2004 03:23:42 -0700
FromAndrew Morton <>
SubjectRe: 2.6.7-rc2-mm1
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".  
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:03    [from the cache]
©2003-2008