Re: Please pull ACPI updates

From: Andi Kleen
Date: Thu Jul 17 2008 - 02:46:02 EST

Linus Torvalds wrote:
> On Wed, 16 Jul 2008, Jesse Barnes wrote:
>>> Andi did not. The whole series I pulled was rebased today at 2PM.
>> Ugg, when Andi took over we talked about it; I thought we had agreed that he
>> would stick with Len's tree. I guess I was wrong.
> Well, I haven't actually seen Len's original tree, so maybe the stuff Andi
> pushed was just the stuff he had queued up independently. I guess I
> shouldn't judge before I'm sure.

I originally started with topic branches and imported a few patches
this way, but then eventually realized they don't really match my
working style. In particular I tend to edit and sometimes
delete old patches and that seems to be quite painful with
the topic branch setup (or perhaps I just haven't figured out
how to do it nicely). Also tried it with guilt, but that
also ran into some issues (in particular after merges one
cannot manage the patches as a guilt stack anymore)

What I did then was to export Len's tree to quilt, do all the touchups
etc, merged some more patches and then regenerated a quilt tree for
the merge request. That is how the old x86-64 tree used to work.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at