From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751557AbdFGLUS (ORCPT ); Wed, 7 Jun 2017 07:20:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54928 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbdFGLTG (ORCPT ); Wed, 7 Jun 2017 07:19:06 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6FBDE80F95 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jolsa@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6FBDE80F95 Date: Wed, 7 Jun 2017 13:19:01 +0200 From: Jiri Olsa To: David Carrillo-Cisneros Cc: linux-kernel , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Andi Kleen , Simon Que , Wang Nan , Jiri Olsa , He Kuang , Masami Hiramatsu , Stephane Eranian , Paul Turner Subject: Re: [PATCH v3 00/15] perf tool: add meta-data header support for pipe-mode Message-ID: <20170607111901.GA17416@krava> References: <20170606070722.35213-1-davidcc@google.com> <20170606123559.GA15056@krava> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.0 (2017-02-23) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 07 Jun 2017 11:19:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 06, 2017 at 11:15:25AM -0700, David Carrillo-Cisneros wrote: > On Tue, Jun 6, 2017 at 5:35 AM, Jiri Olsa wrote: > > On Tue, Jun 06, 2017 at 12:07:07AM -0700, David Carrillo-Cisneros wrote: > >> v3: - Fix header output for event aux record. > >> - Uniformize variable naming and other cleanup. > >> - Other fixes suggested by Jiri and Nahmyung. > > > > what tree did you base your changes on? > > I'm getting git am fail on any tree I try it on: > > > > [jolsa@krava perf]$ git am /tmp/d > > Applying: perf header: encapsulate read and swap > > Applying: perf header: add PROCESS_STR_FUN macro > > Applying: perf header: fail on write_padded error > > Applying: perf util: add const modifier to buf in "writen" function > > Applying: perf header: revamp do_write > > Applying: perf header: add struct feat_fd for write > > Applying: perf header: use struct feat_fd for print > > Applying: perf header: use struct feat_fd to process header records > > Applying: perf header: use struct feat_fd in read header records > > Applying: perf header: make write_pmu_mappings pipe-mode friendly > > Applying: perf header: add a buffer to struct feat_fd > > Applying: perf header: change FEAT_OP* macros > > Applying: perf tool: add show_feature_header to perf_tool > > Applying: perf tools: add feature header record to pipe-mode > > error: patch failed: tools/perf/builtin-annotate.c:398 > > error: tools/perf/builtin-annotate.c: patch does not apply > > Patch failed at 0014 perf tools: add feature header record to pipe-mode > > The copy of the patch that failed is found in: .git/rebase-apply/patch > > When you have resolved this problem, run "git am --continue". > > > > fyi acme's perf/core is the prefered one ;-) > > I used tip/perf/core . Will rebase to acme's. Thank you for testing it. do you have it in some branch somewhere? thanks, jirka