From: "H. Peter Anvin" <hpa@zytor.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>,
Borislav Petkov <bp@alien8.de>, "H.J. Lu" <hjl.tools@gmail.com>,
Ingo Molnar <mingo@elte.hu>, Ingo Molnar <mingo@kernel.org>,
Jarkko Sakkinen <jarkko.sakkinen@intel.com>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Len Brown <len.brown@intel.com>, Len Brown <lenb@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Matthew Garrett <mjg@redhat.com>, Michal Marek <mmarek@suse.cz>,
Paolo Bonzini <pbonzini@redhat.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>,
Sam Ravnborg <sam@ravnborg.org>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [GIT PULL] x86 trampoline rework for 3.5
Date: Tue, 29 May 2012 20:38:44 -0700 [thread overview]
Message-ID: <4FC59644.6060106@zytor.com> (raw)
In-Reply-To: <CA+55aFyNJLYyC71rpNE+6kax+j_6ybN=GE_4fG1YKH2OevkRTg@mail.gmail.com>
On 05/29/2012 08:19 PM, Linus Torvalds wrote:
>
> I didn't see any git silent mis-merges, though. The fact that that
> relocs.c file had come in two different ways did make for a more
> interesting merge, since it didn't have any common ancestry - just two
> different original versions. But git seemed to do the right thing, and
> marked where they differed.
>
I don't know why, but when I did a test merge of my original branch into
top of your tree, it silently merged everything (no markings) but
incorrectly.
Perhaps it is a git version-specific thing.
-hpa
--
H. Peter Anvin, Intel Open Source Technology Center
I work for Intel. I don't speak on their behalf.
prev parent reply other threads:[~2012-05-30 3:41 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-29 23:25 [GIT PULL] x86 trampoline rework for 3.5 H. Peter Anvin
2012-05-30 2:37 ` Linus Torvalds
2012-05-30 3:07 ` H. Peter Anvin
2012-05-30 3:19 ` Linus Torvalds
2012-05-30 3:38 ` H. Peter Anvin [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=4FC59644.6060106@zytor.com \
--to=hpa@zytor.com \
--cc=bp@alien8.de \
--cc=hjl.tools@gmail.com \
--cc=hpa@linux.intel.com \
--cc=jarkko.sakkinen@intel.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=len.brown@intel.com \
--cc=lenb@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@kernel.org \
--cc=mjg@redhat.com \
--cc=mmarek@suse.cz \
--cc=pbonzini@redhat.com \
--cc=rjw@sisk.pl \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.