linux-kernel - Re: [GIT PULL] x86 trampoline rework for 3.5

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CA+55aFyNJLYyC71rpNE+6kax+j_6ybN=GE_4fG1YKH2OevkRTg@mail.gmail.com>
Date:	Tue, 29 May 2012 20:19:45 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	"H. Peter Anvin" <hpa@...or.com>
Cc:	"H. Peter Anvin" <hpa@...ux.intel.com>,
	Borislav Petkov <bp@...en8.de>,
	"H.J. Lu" <hjl.tools@...il.com>, Ingo Molnar <mingo@...e.hu>,
	Ingo Molnar <mingo@...nel.org>,
	Jarkko Sakkinen <jarkko.sakkinen@...el.com>,
	Jeremy Fitzhardinge <jeremy@...p.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Len Brown <len.brown@...el.com>, Len Brown <lenb@...nel.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Matthew Garrett <mjg@...hat.com>,
	Michal Marek <mmarek@...e.cz>,
	Paolo Bonzini <pbonzini@...hat.com>,
	"Rafael J. Wysocki" <rjw@...k.pl>, Sam Ravnborg <sam@...nborg.org>,
	Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [GIT PULL] x86 trampoline rework for 3.5

On Tue, May 29, 2012 at 8:07 PM, H. Peter Anvin <hpa@...or.com> wrote:
>
> Sorry, you're right.  The version with three patterns is correct.

Ok. So I pushed out my merge with that. I think that with the
x86-relocs thing in scripts/.gitignore it then ends up being the same
as yours.

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.

                   Linus
--
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/