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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 5 Dec 2011 23:11:03 -0500 (EST)
From:	Nicolas Pitre <nicolas.pitre@...aro.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	Tejun Heo <tj@...nel.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the memblock tree with the arm
 tree

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@...b.auug.org.au
> 
> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/