linux-kernel - Re: [git pull] x86 fixes

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 for Android: free password hash cracker in your pocket

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

Message-ID: <alpine.LFD.1.10.0807150901120.3017@woody.linux-foundation.org>
Date:	Tue, 15 Jul 2008 09:03:07 -0700 (PDT)
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Ingo Molnar <mingo@...e.hu>
cc:	linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
	"H. Peter Anvin" <hpa@...or.com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [git pull] x86 fixes



On Tue, 15 Jul 2008, Ingo Molnar wrote:
> 
> hm, you just pushed another fix for that out via:
> [...]
> that would collide. Here's a (separate) merged up tree that will pull 
> cleanly:

Heh, I just merged it myself - it happens all the time, I did't even think 
about it.

If it had been any more complex I would have emailed you (and hopefully 
noticed this follow-up email before doing that), but it was rather obvious 
enough, and I just picked your side.

		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/