lkml.org 
[lkml]   [2013]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [BUG] perf timechart segfault

* Ramkumar Ramachandra <artagnon@gmail.com> wrote:

> Jiri Olsa wrote:
> > looks like you're missing this one:
> > (git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux perf/core)
>
> Very messy; doesn't rebase on top of the latest torvalds/linux.git
> cleanly: I get a merge conflict at patch 9 of 74. Since my work is based
> on torvalds/linux.git, I was hoping to rebase it on top of Arnaldo's
> tree, but that results in conflicts too: I'm resolving them now.
>
> Are the merge windows always this large? Why isn't Arnaldo's tree listed
> in MAINTAINERS?

note that it's Arnaldo's development tree, not a tree to generally base
pull requests on - that is what tip:perf/core is for.

Thanks,

Ingo


\
 
 \ /
  Last update: 2013-10-02 15:41    [W:0.067 / U:2.804 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site