From: Andi Kleen <ak@suse.de>
To: Linus Torvalds <torvalds@osdl.org>
Cc: discuss@x86-64.org, linux-kernel@vger.kernel.org
Subject: Re: [discuss] Re: Please pull x86-64 bug fixes
Date: Fri, 6 Oct 2006 01:05:10 +0200 [thread overview]
Message-ID: <200610060105.10357.ak@suse.de> (raw)
In-Reply-To: <Pine.LNX.4.64.0610051556330.3952@g5.osdl.org>
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
prev parent reply other threads:[~2006-10-05 23:05 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-05 17:10 Please pull x86-64 bug fixes Andi Kleen
2006-10-05 17:17 ` Jeff Garzik
2006-10-05 17:31 ` [discuss] " Andi Kleen
2006-10-05 17:43 ` Jeff Garzik
2006-10-05 17:53 ` Andi Kleen
2006-10-05 19:29 ` Jeff Garzik
2006-10-05 19:42 ` Andi Kleen
2006-10-05 20:02 ` Jeff Garzik
2006-10-05 20:10 ` Andi Kleen
2006-10-05 22:45 ` Linus Torvalds
2006-10-05 22:52 ` Andi Kleen
2006-10-05 23:07 ` Linus Torvalds
2006-10-05 23:21 ` Andi Kleen
2006-10-05 23:36 ` Jeff Garzik
2006-10-06 0:57 ` Jeff Garzik
2006-10-06 1:29 ` Linus Torvalds
2006-10-06 11:03 ` Arjan van de Ven
2006-10-06 16:07 ` Linus Torvalds
2006-10-06 16:19 ` Arjan van de Ven
2006-10-06 22:01 ` Rafael J. Wysocki
2006-10-06 22:31 ` Duran, Leo
2006-10-06 23:06 ` Jeff Garzik
2006-10-07 5:23 ` Arjan van de Ven
2006-10-07 2:20 ` Linus Torvalds
2006-10-08 20:59 ` Duran, Leo
2006-10-08 22:42 ` Linus Torvalds
2006-10-05 22:00 ` Alan Cox
2006-10-05 21:44 ` Andi Kleen
2006-10-06 11:14 ` Alan Cox
2006-10-16 12:21 ` Andi Kleen
2006-10-05 17:21 ` Linus Torvalds
2006-10-05 17:27 ` [discuss] " Andi Kleen
2006-10-05 22:59 ` Linus Torvalds
2006-10-05 23:05 ` Andi Kleen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200610060105.10357.ak@suse.de \
--to=ak@suse.de \
--cc=discuss@x86-64.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox