[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20131002132631.GC27811@gmail.com>
Date: Wed, 2 Oct 2013 15:26:31 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Ramkumar Ramachandra <artagnon@...il.com>
Cc: Jiri Olsa <jolsa@...hat.com>, LKML <linux-kernel@...r.kernel.org>,
Arnaldo Carvalho de Melo <acme@...stprotocols.net>
Subject: Re: [BUG] perf timechart segfault
* Ramkumar Ramachandra <artagnon@...il.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists