From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.web.de ([212.227.17.11]:62169 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752928Ab3JBFYh (ORCPT ); Wed, 2 Oct 2013 01:24:37 -0400 Received: from tacticalops.localnet ([93.132.133.153]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0MapFS-1V6wv33T7y-00KQtS for ; Wed, 02 Oct 2013 07:24:36 +0200 From: Martin Walch Subject: [PATCH 3/4] kconfig: adjust warning message for conflicting types Date: Wed, 02 Oct 2013 07:24:33 +0200 Message-ID: <2865108.QhoiiS6j3s@tacticalops> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" Sender: linux-kbuild-owner@vger.kernel.org List-ID: Cc: Michal Marek , Jiri Kosina , "Yann E. MORIN" , Arve =?ISO-8859-1?Q?Hj=F8nnev=E5g?= , Benjamin Poirier , Dirk Gouders , Wang YanQing , Andrew Morton , Jean Delvare , Kees Cook , Alan Cox , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org From: Martin Walch Date: Wed, 2 Oct 2013 06:58:01 +0200 Subject: [PATCH 3/4] kconfig: adjust warning message for conflicting types Adjust warning: a second symbol type does *not* replace the first one. Signed-off-by: Martin Walch --- scripts/kconfig/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index b970101..e511df5 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -119,7 +119,7 @@ void menu_set_type(int type) sym->type = type; return; } - menu_warn(current_entry, "type of '%s' redefined from '%s' to '%s'", + menu_warn(current_entry, "type of '%s' not redefined from '%s' to '%s'", sym->name ? sym->name : "", sym_type_name(sym->type), sym_type_name(type)); } -- 1.8.1.5