lkml.org 
[lkml]   [2009]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: Tree for August 19
On Wed, Aug 19, 2009 at 07:02:33PM +1000, Stephen Rothwell wrote:
> Merging configfs/linux-next
> CONFLICT (content): Merge conflict in fs/configfs/dir.c

Silly question. The last time I had a conflict in next, you
emailed me the details. How do I go about finding them on my own
(without doing the complete merge you do)?

Joel

--

"Up and down that road in our worn out shoes,
Talking bout good things and singing the blues."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127


\
 
 \ /
  Last update: 2009-08-19 11:39    [W:1.071 / U:1.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site