Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754941AbbHJTLj (ORCPT ); Mon, 10 Aug 2015 15:11:39 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:45994 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754842AbbHJTLg (ORCPT ); Mon, 10 Aug 2015 15:11:36 -0400 Date: Mon, 10 Aug 2015 12:11:35 -0700 From: Greg Kroah-Hartman To: "Andre Tomt (LKML)" Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Michael Petlan , Adrian Hunter , Borislav Petkov , David Ahern , Frederic Weisbecker , Jiri Olsa , Namhyung Kim , Stephane Eranian , Arnaldo Carvalho de Melo Subject: Re: [PATCH 4.1 099/123] perf hists browser: Take the --comm, --dsos, etc filters into account Message-ID: <20150810191135.GF20200@kroah.com> References: <20150808220717.771230091@linuxfoundation.org> <20150808220721.150572870@linuxfoundation.org> <55C79819.1000208@tomt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55C79819.1000208@tomt.net> User-Agent: Mutt/1.5.23+102 (2ca89bed6448) (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1854 Lines: 50 On Sun, Aug 09, 2015 at 08:12:41PM +0200, Andre Tomt (LKML) wrote: > On 09. aug. 2015 00:09, Greg Kroah-Hartman wrote: > >4.1-stable review patch. If anyone has any objections, please let me know. > > > >------------------ > > > >From: Arnaldo Carvalho de Melo > > > >commit 9c0fa8dd3d58de8b688fda758eea1719949c7f0a upstream. > > This commit needs upstream commit 0bc2f2f7d080561cc484d2d0a162a9396bed3383 > as well to fix the following build error > > > CC ui/browsers/hists.o > ui/browsers/hists.c: In function 'hist_browser__has_filter': > ui/browsers/hists.c:48:68: error: 'struct symbol_conf' has no member named > 'has_filter' > return hists__has_filter(hb->hists) || hb->min_pcnt || > symbol_conf.has_filter; > ^ > ui/browsers/hists.c:49:1: error: control reaches end of non-void function > [-Werror=return-type] > } > ^ > cc1: all warnings being treated as errors > /disks/build/data/linux-4.1.5-rc1/tools/build/Makefile.build:68: recipe for > target 'ui/browsers/hists.o' failed > make[4]: *** [ui/browsers/hists.o] Error 1 > /disks/build/data/linux-4.1.5-rc1/tools/build/Makefile.build:107: recipe for > target 'browsers' failed > make[3]: *** [browsers] Error 2 > /disks/build/data/linux-4.1.5-rc1/tools/build/Makefile.build:107: recipe for > target 'ui' failed > make[2]: *** [ui] Error 2 > Makefile.perf:366: recipe for target 'libperf-in.o' failed > make[1]: *** [libperf-in.o] Error 2 > Makefile:68: recipe for target 'all' failed > make: *** [all] Error 2 > Now applied, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/