Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932276Ab2E3DUJ (ORCPT ); Tue, 29 May 2012 23:20:09 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:64774 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261Ab2E3DUH convert rfc822-to-8bit (ORCPT ); Tue, 29 May 2012 23:20:07 -0400 MIME-Version: 1.0 In-Reply-To: <4FC58EFE.2070705@zytor.com> References: <201205292325.q4TNPBPw007366@terminus.zytor.com> <4FC58EFE.2070705@zytor.com> From: Linus Torvalds Date: Tue, 29 May 2012 20:19:45 -0700 X-Google-Sender-Auth: -zrKgZpFJuk5BMfxqePCtQiu8Yk Message-ID: Subject: Re: [GIT PULL] x86 trampoline rework for 3.5 To: "H. Peter Anvin" 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 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 858 Lines: 20 On Tue, May 29, 2012 at 8:07 PM, H. Peter Anvin 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/