From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753341Ab1FAGZG (ORCPT ); Wed, 1 Jun 2011 02:25:06 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:35111 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752714Ab1FAGZC (ORCPT ); Wed, 1 Jun 2011 02:25:02 -0400 Date: Wed, 1 Jun 2011 08:24:48 +0200 From: Ingo Molnar To: Linus Torvalds Cc: Borislav Petkov , Joe Perches , linux-kernel@vger.kernel.org, Thomas Gleixner , "H. Peter Anvin" , Andrew Morton Subject: Re: [GIT PULL] x86 fixes Message-ID: <20110601062448.GA28134@elte.hu> References: <20110531163022.GA15435@elte.hu> <1306859709.20175.27.camel@Joe-Laptop> <20110531181650.GA1854@gere.osrc.amd.com> <20110601060046.GA27375@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110601060046.GA27375@elte.hu> User-Agent: Mutt/1.5.20 (2009-08-17) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.3.1 -2.0 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar wrote: > > * Linus Torvalds wrote: > > > On Wed, Jun 1, 2011 at 3:16 AM, Borislav Petkov 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