lkml.org 
[lkml]   [2009]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the ext3 tree with the cifs tree
From
Date
On Wed, 2009-11-25 at 20:04 +1100, Stephen Rothwell wrote:

> I have just noticed that I get the same conflict between the cifs tree
> and the fsnotify tree (hi Eric!) which has also included that patch from
> Christoph. Again, not a big problem.

I was doing my development against linux-next. After I posted them and
decided to commit them to my -next tree I realized they didn't commit
due to hch's patch. So I cherry picked hch's patch and decided I
wouldn't ask linus to pull until after the hch patch went in (I did it
for some things in the net-next tree as well as I recall)

What's the best way? To handle this? do you prefer to just carry the
conflict fix? should we cherry pick things and fix it ourselves? I
guess my method breaks down if the tree in question doesn't eventually
go to linus like it should.....

-Eric



\
 
 \ /
  Last update: 2009-11-25 16:25    [W:0.032 / U:0.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site