Re: [discuss] Re: Please pull x86-64 bug fixes

Andi Kleen
2006-10-05T23:05:16Z

On Friday 06 October 2006 00:59, Linus Torvalds wrote:
>
> On Thu, 5 Oct 2006, Andi Kleen wrote:
> >
> > Ok. Please drop them then.
>
> Ok, done. Since they weren't the last commits in your branch, I had to do
> a certain amount of hand-waving: I merged up to the commit preceding the
> AC flag changes, and then I cherry-picked the one later commit separately.
>
> So it's not a normal merge, since I wanted to avoid those two commits.
>
> I've pushed out the result, you should check it out

Looks good thanks.

> (and drop the top
> three commits on your head once you're ok with my result, since they won't
> exist in my tree).

I only use temporary merge trees from quilt anyways, so it's fine
for me.

-Andi