Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932324Ab2E3DlF (ORCPT ); Tue, 29 May 2012 23:41:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:32802 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932308Ab2E3Dk3 (ORCPT ); Tue, 29 May 2012 23:40:29 -0400 Message-ID: <4FC59644.6060106@zytor.com> Date: Tue, 29 May 2012 20:38:44 -0700 From: "H. Peter Anvin" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Linus Torvalds CC: "H. Peter Anvin" , Borislav Petkov , "H.J. Lu" , Ingo Molnar , Ingo Molnar , Jarkko Sakkinen , Jeremy Fitzhardinge , Konrad Rzeszutek Wilk , Len Brown , Len Brown , Linux Kernel Mailing List , Matthew Garrett , Michal Marek , Paolo Bonzini , "Rafael J. Wysocki" , Sam Ravnborg , Thomas Gleixner Subject: Re: [GIT PULL] x86 trampoline rework for 3.5 References: <201205292325.q4TNPBPw007366@terminus.zytor.com> <4FC58EFE.2070705@zytor.com> In-Reply-To: X-Enigmail-Version: 1.4.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 923 Lines: 27 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/