From: Robert Richter <robert.richter@amd.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Matt Helsley <matthltc@us.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Matt Fleming <matt@console-pimps.org>
Subject: Re: linux-next: manual merge of the oprofile tree with the tip tree
Date: Fri, 15 Oct 2010 14:43:57 +0200 [thread overview]
Message-ID: <20101015124357.GC5969@erda.amd.com> (raw)
In-Reply-To: <20101012131828.5fedf1bf.sfr@canb.auug.org.au>
On 11.10.10 22:18:28, Stephen Rothwell wrote:
> Today's linux-next merge of the oprofile tree got a conflict in
> arch/arm/oprofile/common.c between commit
> 38a81da2205f94e8a2a834b51a6b99c91fc7c2e8 ("perf events: Clean up pid
> passing") from the tip tree and commit
> 3d90a00763b51e1db344a7430c966be723b67a29 ("oprofile: Abstract the
> perf-events backend") from the oprofile tree.
>
> The latter moved the code modified by the former, so I used the version
> of this file from the oprofile tree. I also applied the effect of the
> tip tree patch to the new file drivers/oprofile/oprofile_perf.c:
Stephen,
I merged both trees and updated my oprofile for-next branch. They
should merge now without conflicts.
Thanks,
-Robert
--
Advanced Micro Devices, Inc.
Operating System Research Center
next prev parent reply other threads:[~2010-10-15 12:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-12 2:18 linux-next: manual merge of the oprofile tree with the tip tree 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 [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
2012-03-13 6:37 Stephen Rothwell
2012-03-13 8:31 ` Ingo Molnar
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=20101015124357.GC5969@erda.amd.com \
--to=robert.richter@amd.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matt@console-pimps.org \
--cc=matthltc@us.ibm.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).