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
| ||
|
Date: Wed, 1 Jun 2011 08:24:48 +0200 From: Ingo Molnar <mingo@...e.hu> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Borislav Petkov <bp@...64.org>, Joe Perches <joe@...ches.com>, 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 * Ingo Molnar <mingo@...e.hu> wrote: > > * Linus Torvalds <torvalds@...ux-foundation.org> wrote: > > > On Wed, Jun 1, 2011 at 3:16 AM, Borislav Petkov <bp@...64.org> wrote: > > > > > > Crap, there's no fixing this string :) > > > > I tried to fix it up in the merge. We call these "evil merges" in > > git-speak, but I hope the problem was worth doing one ;) > > You have not pushed it out yet, right? [ Or if you have then the > evilness is well hidden! :-) ] Oh, you did push it out, i just forgot to merge it in :) I don't think it's a truly evil merge if it's declared in the merge commit log - but yeah, it's outside the scope given by the two trees so technically it's evil :) Thanks, Ingo -- 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/
Powered by blists - more mailing lists