From: Andi Kleen <ak@suse.de>
To: Linus Torvalds <torvalds@osdl.org>
Subject: Re: [discuss] Re: Please pull x86-64 bug fixes
Date: Fri, 6 Oct 2006 01:05:10 +0200
User-Agent: KMail/1.9.3
Cc: discuss@x86-64.org, linux-kernel@vger.kernel.org
References: <200610051910.25418.ak@suse.de> <200610051927.27255.ak@suse.de> <Pine.LNX.4.64.0610051556330.3952@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0610051556330.3952@g5.osdl.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200610060105.10357.ak@suse.de>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 969
Lines: 29

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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/