On Thursday 15 March 2007 17:04, Theodore Tso wrote:
quoted text
> So it does handle octopus merges already (it has to, the ACPI folks
> are very ocotpus merge happy :-).

Well, just to set the record straight...

So yes, I did a 12-way merge in the kernel a long while back on a lark.
I don't generally do them any more in the official kernel tree
because I think they make bisect more complicated than it needs to be.

cheers,
-Len
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html