From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755919AbcCBQey (ORCPT <rfc822;w@1wt.eu>);
	Wed, 2 Mar 2016 11:34:54 -0500
Received: from mout.kundenserver.de ([212.227.126.133]:61694 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752010AbcCBQew convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 2 Mar 2016 11:34:52 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>,
        Olof Johansson <olof@lixom.net>, ARM Maintainers <arm@kernel.org>,
        linux-arm-kernel@lists.infradead.org,
        Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
        Russell King <linux@arm.linux.org.uk>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code
Date: Wed, 02 Mar 2016 17:31:44 +0100
Message-ID: <2506540.Af9r4eEVXL@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
In-Reply-To: <56D70ADB.2050008@atmel.com>
References: <1456238384-882646-1-git-send-email-arnd@arndb.de> <56D70ADB.2050008@atmel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8BIT
Content-Type: text/plain; charset="iso-8859-1"
X-Provags-ID: V03:K0:UuM4jPfafVJ/gtRH+0wbIh2GKcIlv2MpkysJm3HgnoALPkq87xU
 2eoPxwJFVTkV5nsQT3eUX5PYUdJWapTXmKja7uS88gzkHY9C++O/C+aMGfHedTztzc4zapy
 UwpkZ1d0wdOm3YyjCLVvzKO8+i/sXELYKocJXwT6jryc/bw3C1/HRq9tQx1EHZ9nfpyvxsh
 R2YXa9dhcltvtCxdZAj6A==
X-UI-Out-Filterresults: notjunk:1;V01:K0:ZaoALa/Zbtw=:DeGKveD/kuMnQsW4SDMiyu
 kdCzqZw8NrwLx8Wv0kEPfmrwjO/SC0Fx1OuJsFpqafA4AuLhL77OZ0iOH/W+swlSmi+4XBK2G
 p1M3tqezfp1k+JnLkKJ9f1feTI7F5Kn5rFMKOh1+d8jWsy9FlpppUKJZaTxglxBQC53UHE1NN
 EYJgIrcvdD5F9ETcTmePJvzw62dKsFE0pjYP3zTwcGRdZ7VIXNvVBUc7SA+zfJTXyE0GdLoq6
 hqZKNXIFkbyV0xXtzgIxpExoNf1u5oBiwsasKAMRiTT+FAw1XptcfC6YHZreAzr94zC+UzWcJ
 y1iJddtSwYWtEopX8yF7shbEy49/HUQzpiZlzOI8Kt7ucHZFDBoSw18DQMmxhwGCXg1YtRaYI
 hUVLp0vwmS0BMEQlixQO9c81fYtuDK+HR1VuLxHb0bifeXAWqtwEPBKegOmW3qNwhex2no78S
 KidctnD9zR1+X71TrFQ227yCA4HmisJf/PKDzuJLa6Cp+Kz5nGGM3LtnxX3NgntDRnVcI7ssv
 r+qtnGVlqEzWZO//4tZqyck5AgQWGd9II9gT+W0LUMFVRiL+426dtAzfZQ4ULEb/SQAWTsLhx
 w5Up72v9rAgM+8I0CpdFKkeG/9EUcgcE3vthP4ApcBLnl9NBFJq6oef6YJVdOKbkItSkLhtsI
 9+WeBES0XP26dF/xObYMXX85mKrn2slrSWrO2X/o6wUTrL9qmrm4ehloHE3V9I1YoDPVL1IqF
 CMrtE6e26K9lu5K9
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wednesday 02 March 2016 16:46:35 Nicolas Ferre wrote:
> Le 23/02/2016 15:39, Arnd Bergmann a écrit :
> > In an invalid randconfig build (fixed by another patch),
> > I ran across this warning:
> > 
> > arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror]
> >  #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS)
> > 
> > As Russell pointed out, we should never #define a macro starting
> > with CONFIG_ in a source file, as that is rather confusing.
> > 
> > This renames the macro to avoid the symbol clash.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Suggested-by: Russell King <linux@arm.linux.org.uk>
> 
> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> 
> Arnd,
> 
> Can you please add this patch on top of the arm-soc branches "soc" or
> "cleanup" for 4.6.
> I don't think that we will have more material for these branches to send
> to you before the opening of the merge window.
> 
> Thanks for your patch, bye.

Applied to next/soc, thanks!

	Arnd