Re: [PATCH v3 00/15] perf tool: add meta-data header support for pipe-mode

[David Carrillo-Cisneros <davidcc@google.com>]

On Tue, Jun 6, 2017 at 5:35 AM, Jiri Olsa <jolsa@redhat.com> 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.

David
>
> thanks,
> jirka