From: Jiri Olsa <jolsa@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Ralf Baechle <ralf@linux-mips.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Daney <david.daney@cavium.com>,
Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: Re: linux-next: manual merge of the tip tree with the mips tree
Date: Fri, 17 Apr 2015 17:33:43 +0200 [thread overview]
Message-ID: <20150417153343.GE17654@krava> (raw)
In-Reply-To: <20150413155913.28eace15@canb.auug.org.au>
On Mon, Apr 13, 2015 at 03:59:13PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in
> tools/perf/config/Makefile between commit 4fd6ce055817 ("perf tools:
> Hook up MIPS unwind and dwarf-regs in the Makefile") from the mips tree
hi,
I remember reviewing following patchset:
[PATCH 1/2] perf tools: Add support for MIPS userspace DWARF callchains.
[PATCH 2/2] perf tools: Hook up MIPS unwind and dwarf-regs in the Makefile
but it did not fit on top of current tip, v2 was needed,
which I haven't seen yet.. but I might have missed that,
in which case sorry for the noise ;-)
jirka
next prev parent reply other threads:[~2015-04-17 15:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 5:59 linux-next: manual merge of the tip tree with the mips tree Stephen Rothwell
2015-04-17 15:33 ` Jiri Olsa [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-09-04 4:19 Stephen Rothwell
2016-03-14 2:18 Stephen Rothwell
2014-10-09 4:09 Stephen Rothwell
2014-01-15 5:06 Stephen Rothwell
2014-01-15 5:00 Stephen Rothwell
2011-11-23 2:01 Stephen Rothwell
2011-11-23 2:07 ` Deng-Cheng Zhu
2011-11-23 2:07 ` Deng-Cheng Zhu
2009-11-23 5:46 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150417153343.GE17654@krava \
--to=jolsa@redhat.com \
--cc=acme@redhat.com \
--cc=david.daney@cavium.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.