Re: linux-next: manual merge of the msm tree with the arm tree

[Daniel Walker]

On Mon, 2010-10-18 at 15:29 -0400, Nicolas Pitre wrote:

> > Ok, well in that case why not accept this immediately after the merge
> > window? A point when everything is quiet, and most of the tree's are
> > empty?
> 
> RMK has his own merge window which closes about at the same time as 
> Linus' one opens.  We thought this was happening last week and therefore 
> this change was supposed to be the last one.

It seems like that could potentially make these kinds of problem worse,
since your merging things immediately before sending them to Linus. Like
right now we only have a fairly short amount of time to correct this
conflict. 

> > Well how about I merge this change into my tree ?
> 
> If you ask RMK to merge your tree in his that would be much simpler to 
> add this change in a single pass afterwards.

I can do that , but would I still be able to merge stuff into my tree?
Seems like I could, Russell would just clean up the conflict and my tree
would just move forward like it has been already , and I would send the
whole thing to Linus.

Daniel


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/