Re: Request for linux-next inclusion of the voyager tree

[Linus Torvalds <torvalds@linux-foundation.org>]

On Wed, 10 Jun 2009, James Bottomley wrote:
> 
> If I go the merge point route, I get a tree with more non trivial merge
> points than commits, so it becomes incredibly difficult for anyone to
> follow what's going on.  I also can no longer use git-email to send my
> patch series anywhere.

Why do you need to merge at all?

Do you get constant conflicts? If so, _that_ is likely the problem.

The rule should be that you should _never_ need to merge from Ingo or me, 
and things should be smooth. And if there are too frequent conflicts for 
that to work, then the rule should be that things get cleaned up so that 
those conflicts don't happen!

Constant rebasing, or constant merging, is a symptom of something simply 
not working. It's probably why Ingo is fed up with Voyager in the first 
place. Can you guys just start telling me what the actual maintenance 
problem is? Where do you actually step on each others toes? What are the 
conflicts? Why is Voyager so special?

			Linus