Re: "Read my lips: no more merges" - aka Linux 2.6.14-rc1

[Linus Torvalds]

On Tue, 13 Sep 2005, Roland Dreier wrote:
>
> Sorry for being dense, but can you say what "no more merges" means?

It's not so much a technical thing - I'll happily do git merges that fix 
bugs. But I don't want to merge big stuff (of course, it turns out that 
I'd missed a few before the release, so I did those anyway).

> As a concrete example, suppose I have a git tree with something like
> 
>  drivers/infiniband/hw/mthca/mthca_qp.c    |    2 +-
>  drivers/infiniband/ulp/ipoib/ipoib_main.c |    2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> ie a couple of really small, simple fixes.

I'll happily take them. I'd suggest you include the patches themselves in 
the "please pull.." message, just to make it obvious what's going on, but 
it would be stupid to avoid using technical means to get the patches in. 
So I'll certainly go git merges for these kinds of things.

		Linus
-
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/