From: Ingo Molnar <mingo@elte•hu>
To: Robert Richter <robert.richter@amd•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Stephane Eranian <eranian@google•com>,
Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Stephen Rothwell <sfr@canb•auug.org.au>
Subject: Re: linux-next: manual merge of the oprofile tree with the tip tree
Date: Tue, 13 Mar 2012 09:31:34 +0100 [thread overview]
Message-ID: <20120313083134.GB1888@elte.hu> (raw)
In-Reply-To: <20120313173712.52ecb636a1e3d4330fe8baff@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Robert,
>
> Today's linux-next merge of the oprofile tree got a conflict
> in tools/perf/util/header.c tools/perf/util/header.h between
> commit 330aa675b4f9 ("perf record: Add HEADER_BRANCH_STACK
> tag") from the tip tree and commit c415f577eb32 ("perf tools:
> Add pmu mappings to header information") from the oprofile
> tree.
Robert,
Hm, that commit should obviously be processed via the regular
perf channels, not via the oprofile tree ... Please resolve
this.
Thanks,
Ingo
next prev parent reply other threads:[~2012-03-13 8:31 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 6:37 linux-next: manual merge of the oprofile tree with the tip tree Stephen Rothwell
2012-03-13 8:31 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-21 5:31 Stephen Rothwell
2012-03-21 12:33 ` Robert Richter
2012-03-21 13:52 ` Stephen Rothwell
2010-10-12 2:18 Stephen Rothwell
2010-10-12 6:03 ` Matt Fleming
2010-10-12 12:23 ` Stephen Rothwell
2010-10-12 12:51 ` Matt Fleming
2010-10-15 12:43 ` Robert Richter
2010-10-12 2:13 Stephen Rothwell
2010-10-01 3:53 Stephen Rothwell
2010-10-01 13:21 ` Robert Richter
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=20120313083134.GB1888@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=eranian@google$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
--cc=robert.richter@amd$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox