From: Paul Mundt <lethal@linux-sh.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Magnus Damm <damm@opensource.se>
Subject: Re: linux-next: manual merge of the rmobile tree with the rmobile-current tree
Date: Mon, 20 Dec 2010 10:38:58 +0900 [thread overview]
Message-ID: <20101220013858.GA10050@linux-sh.org> (raw)
In-Reply-To: <20101220123329.be4093ad.sfr@canb.auug.org.au>
On Mon, Dec 20, 2010 at 12:33:29PM +1100, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rmobile tree got a conflict in
> arch/arm/mach-shmobile/include/mach/entry-macro.S between commit
> 1cf215a5b43950d1a304373037828158057ff9fc ("ARM: mach-shmobile: INTC
> interrupt priority level demux fix") from the rmobile-current tree and
> commits 6d9598e24d50a8c72f48a3864327484a30aaee44 ("ARM: mach-shmobile:
> Initial AG5 and AG5EVM support") and
> 45bbaae0dcddc275594e23f108cb68869eae7433 ("ARM: mach-shmobile: Split out
> entry-macros in to GIC and INTC variants") from the rmobile tree.
>
> I just used the version from the rmobile tree and will leave any fixup to
> you.
Ah, I forgot about that. I'll take care of it today, thanks.
prev parent reply other threads:[~2010-12-20 1:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-20 1:33 linux-next: manual merge of the rmobile tree with the rmobile-current tree Stephen Rothwell
2010-12-20 1:38 ` Paul Mundt [this message]
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=20101220013858.GA10050@linux-sh.org \
--to=lethal@linux-sh.org \
--cc=damm@opensource.se \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).