[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200610060105.10357.ak@suse.de>
Date: Fri, 6 Oct 2006 01:05:10 +0200
From: Andi Kleen <ak@...e.de>
To: Linus Torvalds <torvalds@...l.org>
Cc: discuss@...-64.org, linux-kernel@...r.kernel.org
Subject: Re: [discuss] Re: Please pull x86-64 bug fixes
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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists