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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
