lkml.org 
[lkml]   [2013]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the akpm tree with the sparc-next tree
From
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Mar 2013 16:33:28 +1100

> Today's linux-next merge of the akpm tree got a conflict in
> arch/sparc/mm/init_64.c between commit ce835e513a93 ("sparc64: Do not
> change num_physpages during initmem freeing") from the sparc-next tree
> and commit "mm/SPARC: use common help functions to free reserved pages"
> from the akpm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

This was expected, and the merge resolution looks fine to me,
thanks Stephen!


\
 
 \ /
  Last update: 2013-03-21 22:04    [W:0.024 / U:0.220 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site