From patchwork Wed Oct 2 05:24:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Walch X-Patchwork-Id: 2973041 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 353D2BFF0B for ; Wed, 2 Oct 2013 05:25:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67F692039F for ; Wed, 2 Oct 2013 05:25:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CCE62039B for ; Wed, 2 Oct 2013 05:25:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187Ab3JBFZE (ORCPT ); Wed, 2 Oct 2013 01:25:04 -0400 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 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 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> User-Agent: KMail/4.11.1 (Linux/3.10.7-gentoo-r1-gnu; KDE/4.11.1; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:eHV7XgbpFFvfCMYVnKEXXhdeg8Y/WumExQ38hTLhX4WEDHf2bS5 5NvCRh5WzEnigU9/1wIrzpCI58jhjgBEuzIV+RgQYCyqA8OQGfRl/XkJlprZTyBz+yt5Z9w g0PCwyNOG6YmBjsQCbd0Kaw8UblD5rMYMYYfUBt4V8BUyoRvhSrnMQ3uM1z9nT2kgWRKfNs RdXt+EUgL6vllw8LofD4A== To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, KHOP_BIG_TO_CC,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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)); }