From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751599AbdFFMgE (ORCPT <rfc822;w@1wt.eu>);
        Tue, 6 Jun 2017 08:36:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:41594 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751401AbdFFMgD (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 6 Jun 2017 08:36:03 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BD065A723
Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jolsa@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com BD065A723
Date: Tue, 6 Jun 2017 14:35:59 +0200
From: Jiri Olsa <jolsa@redhat.com>
To: David Carrillo-Cisneros <davidcc@google.com>
Cc: linux-kernel@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Andi Kleen <ak@linux.intel.com>, Simon Que <sque@chromium.org>,
        Wang Nan <wangnan0@huawei.com>, Jiri Olsa <jolsa@kernel.org>,
        He Kuang <hekuang@huawei.com>, Masami Hiramatsu <mhiramat@kernel.org>,
        Stephane Eranian <eranian@google.com>, Paul Turner <pjt@google.com>
Subject: Re: [PATCH v3 00/15] perf tool: add meta-data header support for
 pipe-mode
Message-ID: <20170606123559.GA15056@krava>
References: <20170606070722.35213-1-davidcc@google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170606070722.35213-1-davidcc@google.com>
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.29]); Tue, 06 Jun 2017 12:36:03 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 ;-)

thanks,
jirka