Messages in this thread | | | From | Ramkumar Ramachandra <> | Date | Wed, 2 Oct 2013 18:40:26 +0530 | Subject | Re: [BUG] perf timechart segfault |
| |
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?
| |