On Monday 18 October 2010 22:12:54 Daniel Walker wrote:
What Nicolas was talking about is the *end* of the merge window, not the
start. This is how all sensible maintainer trees work: you get to
merge stuff into the maintainer tree for a number of weeks (some start
at -rc1, other start a bit later). When Linus tells people to get ready
for the release, the subsystem goes into regression fix mode and when
Linus opens his merge window, everything should be reasonably stable.
When you know that Russell does not rebase his tree, you can pull his
tree into yours whenever a change hits his tree that impacts you in
a major way. You shouldn't do this too frequently, but it's a good way
to resolve conflicts like this one.
Arnd
--
