Re: linux-next: manual merge of the memblock tree with the armtree

[Nicolas Pitre]

On Tue, 6 Dec 2011, Stephen Rothwell wrote:

> Hi Tejun,
> 
> [Tejun, I know you told me about these, but I am reporting them anyway
> just for completeness.]
> 
> Today's linux-next merge of the memblock tree got a conflict in
> arch/arm/mm/init.c between commit 27a3f0e91bed ("ARM: sort the meminfo
> array earlier") from the arm tree and commit 0dac7e2d90aa ("memblock:
> Kill memblock_init()") from the memblock tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

The fix looks trivially correct.


> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc arch/arm/mm/init.c
> index 786addd,7c38474..0000000
> --- a/arch/arm/mm/init.c
> +++ b/arch/arm/mm/init.c
> @@@ -310,7 -331,8 +311,6 @@@ void __init arm_memblock_init(struct me
>   {
>   	int i;
>   
> - 	memblock_init();
>  -	sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
>  -
>   	for (i = 0; i < mi->nr_banks; i++)
>   		memblock_add(mi->bank[i].start, mi->bank[i].size);
>   
> 
--
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/