Messages in this thread | | | Date | Wed, 9 Jul 2014 13:49:03 +0200 | From | Jiri Olsa <> | Subject | Re: [PATCH 2/3] perf script: Add callchain to generic and tracepoint events |
| |
On Wed, Jul 09, 2014 at 01:43:18PM +0200, Joseph Schuchart wrote: > Jirka, > > 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?
is your HEAD 8b5b584 ?
[jolsa@krava perf]$ git show --oneline tip/perf/core 8b5b584 Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
jirka
| |