lkml.org 
[lkml]   [2010]   [Dec]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the rmobile tree with the rmobile-current tree
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.


\
 
 \ /
  Last update: 2010-12-20 02:43    [from the cache]
©2003-2011 Jasper Spaans