[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CALkWK0ny7MT=5uWykERjKrAe5Odpq72gsFneQB6z1jNHYu6xsw@mail.gmail.com>
Date: Wed, 2 Oct 2013 18:40:26 +0530
From: Ramkumar Ramachandra <artagnon@...il.com>
To: Jiri Olsa <jolsa@...hat.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>,
Arnaldo Carvalho de Melo <acme@...stprotocols.net>
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?
--
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