Messages in this thread | | | Date | Thu, 10 Nov 2005 00:09:10 +0100 | From | Jesper Juhl <> | Subject | Re: merge status |
| |
On 11/10/05, Andrew Morton <akpm@osdl.org> wrote: > James Bottomley <James.Bottomley@SteelEye.com> wrote: > > > > it's my contributors who drop me in it > > by leaving their patch sets until you declare a kernel, dumping the > > integration testing on me in whatever time window is left. > > Yes, I think I'm noticing an uptick in patches as soon as a kernel is > released. > > It's a bit irritating, and is unexpected (here, at least). I guess people > like to hold onto their work for as long as possible so when they release > it, it's in the best possible shape. > > I guess all we can do is to encourage people to merge up when it's working, > not when it's time to merge it into mainline. > > One could just say "if I don't have it by the time 2.6.n is released, it > goes into 2.6.n+2", but that's probably getting outside the realm of > practicality.
I personally find that a nice flow is to just continuously push patches to you to merge into -mm, then once the merge window opens you usually push the stuff onto Linus and it'll make the next kernel. Anything I submit after the merge window opens will just stay in -mm and wait for the next merge window (or next+1 depending on the patch).
But then my stuff is usually quite simple, so I guess that doesn't work for everyone, but for me at least it seems to work well.
-- Jesper Juhl <jesper.juhl@gmail.com> Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please http://www.expita.com/nomime.html - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |