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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/