* linux-next: manual merge of the rmobile tree with the rmobile-current tree
@ 2010-12-20 1:33 Stephen Rothwell
2010-12-20 1:38 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-12-20 1:33 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-next, linux-kernel, Magnus Damm
[-- Attachment #1: Type: text/plain, Size: 724 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the rmobile tree with the rmobile-current tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2010-12-20 1:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Magnus Damm
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-20 1:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).