From: Robert Richter <robert.richter@amd.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lin Ming <ming.m.lin@intel.com>, Jiri Olsa <jolsa@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: Re: linux-next: manual merge of the oprofile tree with the tip tree
Date: Wed, 21 Mar 2012 13:33:48 +0100 [thread overview]
Message-ID: <20120321123348.GJ16322@erda.amd.com> (raw)
In-Reply-To: <20120321163151.83cad17d5524424938f7576c@canb.auug.org.au>
On 21.03.12 16:31:51, Stephen Rothwell wrote:
> Today's linux-next merge of the oprofile tree got a conflict in
> tools/perf/util/parse-events.c between commit 89812fc81f8d ("perf tools:
> Add parser generator for events parsing") from the tip tree and commit
> 1e48600d2388 ("perf tool: Parse general/raw events from sysfs") from the
> oprofile tree.
>
> I have no idea how to fix this up, so I effectively dropped this patch
> from the oprofile tree.
Yeah, the trees are totally different now. Removed my tree from
for-next.
Btw, please switch my for-next tree back to kernel.org:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git for-next
Thanks.
-Robert
--
Advanced Micro Devices, Inc.
Operating System Research Center
next prev parent reply other threads:[~2012-03-21 12:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 5:31 linux-next: manual merge of the oprofile tree with the tip tree Stephen Rothwell
2012-03-21 12:33 ` Robert Richter [this message]
2012-03-21 13:52 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 6:37 Stephen Rothwell
2012-03-13 8:31 ` Ingo Molnar
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=20120321123348.GJ16322@erda.amd.com \
--to=robert.richter@amd.com \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ming.m.lin@intel.com \
--cc=mingo@elte.hu \
--cc=peterz@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).