From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932181AbbDMPBI (ORCPT ); Mon, 13 Apr 2015 11:01:08 -0400 Received: from smtprelay0134.hostedemail.com ([216.40.44.134]:39206 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753594AbbDMPBF (ORCPT ); Mon, 13 Apr 2015 11:01:05 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 73,5,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:355:379:541:599:800:960:968:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3865:3866:3867:3868:3870:3871:3872:3874:4605:5007:6261:7875:7903:9389:10011:10400:10848:10967:11026:11232:11473:11658:11914:12043:12109:12517:12519:12740:13069:13311:13357:13972:14096:14097:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:1:0 X-HE-Tag: van19_264523267a336 X-Filterd-Recvd-Size: 2107 Date: Mon, 13 Apr 2015 11:01:01 -0400 From: Steven Rostedt To: Greg KH Cc: Stephen Rothwell , Arnd Bergmann , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tomas Winkler Subject: Re: linux-next: build warnings after merge of the char-misc tree Message-ID: <20150413110101.2aa3c3d0@gandalf.local.home> In-Reply-To: <20150413104328.GB6390@kroah.com> References: <20150413193720.56083fbf@canb.auug.org.au> <20150413104328.GB6390@kroah.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 13 Apr 2015 12:43:28 +0200 Greg KH wrote: > > 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 :( > Looking at this deeper, this commit isn't a problem with the trace system change. It is caused probably by a cut and paste from a driver that had TRACE_SYSTEM_STRING and should not have. A simple removal of this define should be enough to fix the issue. -- Steve