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>,
Will Deacon <will.deacon@arm.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the oprofile tree with the tip tree
Date: Fri, 1 Oct 2010 15:21:52 +0200 [thread overview]
Message-ID: <20101001132151.GC13563@erda.amd.com> (raw)
In-Reply-To: <20101001135301.5307c860.sfr@canb.auug.org.au>
On 30.09.10 23:53:01, Stephen Rothwell wrote:
> Today's linux-next merge of the oprofile tree got a conflict in
> arch/arm/oprofile/common.c between commit
> 98d943b02f6f1b57787ff1aa6f34d019a407e3ee ("oprofile, ARM: Release
> resources on failure") from the tip tree and commit
> c7fd239a647ead1c336a051012d6bb96465ea8c6 ("ARM: oprofile: fix and
> simplify init/exit functions") from the oprofile tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary.
Stephen,
thanks for catching this. I have updated the oprofile/for-next tree
and now it should merge without conflicts with tip.
Will,
you may pull the merge from oprofile/core too.
Thanks again,
-Robert
--
Advanced Micro Devices, Inc.
Operating System Research Center
next prev parent reply other threads:[~2010-10-01 13:21 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-01 3:53 linux-next: manual merge of the oprofile tree with the tip tree Stephen Rothwell
2010-10-01 13:21 ` Robert Richter [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-10-12 2:13 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
2012-03-13 6:37 Stephen Rothwell
2012-03-13 8:31 ` Ingo Molnar
2012-03-21 5:31 Stephen Rothwell
2012-03-21 12:33 ` Robert Richter
2012-03-21 13:52 ` 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=20101001132151.GC13563@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=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/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).