Re: linux-next: manual merge of the akpm tree with the sparc-nexttree

[David Miller]

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
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!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/