From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: build warnings after merge of the char-misc tree Date: Mon, 13 Apr 2015 12:43:28 +0200 Message-ID: <20150413104328.GB6390@kroah.com> References: <20150413193720.56083fbf@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out4-smtp.messagingengine.com ([66.111.4.28]:38860 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753769AbbDMKna (ORCPT ); Mon, 13 Apr 2015 06:43:30 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id B05A220C88 for ; Mon, 13 Apr 2015 06:43:29 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20150413193720.56083fbf@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Arnd Bergmann , Steven Rostedt , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler On Mon, Apr 13, 2015 at 07:37:20PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the char-misc tree, today's linux-next build (x86_64 > allmodconfig) produced these warnings: > > In file included from include/trace/define_trace.h:90:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:83:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/ftrace.h:134:0, > from include/trace/define_trace.h:90, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/define_trace.h:90:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > include/trace/ftrace.h:28:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:90:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > include/trace/ftrace.h:28:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > In file included from include/trace/define_trace.h:83:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/ftrace.h:134:0, > from include/trace/define_trace.h:90, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > drivers/misc/mei/./mei-trace.h:29:0: warning: "TRACE_SYSTEM_STRING" redefined > #define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM) > ^ > In file included from include/trace/define_trace.h:90:0, > from drivers/misc/mei/mei-trace.h:76, > from drivers/misc/mei/mei-trace.c:21: > include/trace/ftrace.h:28:0: note: this is the location of the previous definition > #define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) > ^ > > Introduced by commit a0a927d06d79 ("mei: me: add io register tracing") > interacting with commit acd388fd3af3 ("tracing: Give system name a > pointer") from the ftrace tree. > > TRACE_SYSTEM_STRING should be removed from drivers/misc/mei/mei-trace.h > as it is not being used anywhere in the mei-trace code. That's nice for such system-wide changes to be done at the last possible minute in the development cycle :( Anyway, someone from the trace subsystem wish to send me a patch for this? thanks, greg k-h