Re: [PATCH 2/3] perf script: Add callchain to generic and tracepoint events
From: Joseph Schuchart
Date: Wed Jul 09 2014 - 07:43:39 EST
I tried to apply the patches to the latest version of the perf/core branch before sending. Can you please send me some more information about the conflict?
On 09.07.2014 13:27, Jiri Olsa wrote:
> On Wed, Jul 09, 2014 at 09:40:34AM +0200, Joseph Schuchart wrote:
>> [PATCH 2/3] perf script: Add callchain to generic and tracepoint events. Since
>> this alters the interface for the python scripts, also adjust the script
>> generation and the provided scripts.
> still having issues to apply 2nd patch on tip/perf/core (8b5b584)
> Applying: perf script: Add missing calls to Py_DECREF for return values
> Applying: perf script: Add callchain to generic and tracepoint events
> error: patch failed: tools/perf/util/scripting-engines/trace-event-python.c:237
> error: tools/perf/util/scripting-engines/trace-event-python.c: patch does not apply
> Patch failed at 0002 perf script: Add callchain to generic and tracepoint events
> The copy of the patch that failed is found in:
> When you have resolved this problem, run "git am --resolved".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
Dipl. Inf. Joseph Schuchart
Technische Universität Dresden
Center for Information Services and High Performance Computing (ZIH)
01062 Dresden, Germany
Phone: +49 351 463-36494
Fax: +49 351 463-3773
Description: S/MIME Cryptographic Signature