Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764069AbYJJUoT (ORCPT ); Fri, 10 Oct 2008 16:44:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758977AbYJJUoL (ORCPT ); Fri, 10 Oct 2008 16:44:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55404 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758460AbYJJUoK (ORCPT ); Fri, 10 Oct 2008 16:44:10 -0400 Message-ID: <48EFBE65.60505@zytor.com> Date: Fri, 10 Oct 2008 13:43:17 -0700 From: "H. Peter Anvin" User-Agent: Thunderbird 2.0.0.14 (X11/20080501) MIME-Version: 1.0 To: Vegard Nossum CC: Ingo Molnar , Linus Torvalds , Linux Kernel Mailing List , Andrew Morton , Thomas Gleixner Subject: Re: [git pull] x86 updates for v2.6.28, phase #1 References: <20081009234705.GA20540@elte.hu> <20081010152631.GB26231@elte.hu> <20081010155830.GA4767@elte.hu> <19f34abd0810101339x66afc6d3mb6efa1a52e186816@mail.gmail.com> In-Reply-To: <19f34abd0810101339x66afc6d3mb6efa1a52e186816@mail.gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 977 Lines: 28 Vegard Nossum wrote: > > Note: If you don't want the double underscores anywhere, this patch is > not enough. > > For example: > >> -#endif /* ASM_X86__MACH_DEFAULT__MACH_TIMER_H */ >> +#endif /* _ASM_X86_MACH_DEFAULT__MACH_TIMER_H */ > > There are also a few non-trivial changes, which could break with a > naïve sed script. So I suggest to simply revert it, it's a lot safer > than trying to patch it up in the last minute. > > I'm obviously also sorry for causing this problem in the first place... *blush* > Double underscores aren't the problem per se, the problem is having changes _ASM_X86_ to ASM_X86__ and therefore violating the namespace. That being said, I don't personally like the double underscores. -hpa -- 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/