linux-kernel - linux-next: manual merge of the akpm tree with the memblock 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>] [day] [month] [year] [list]

Date:	Fri, 9 Dec 2011 15:57:59 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Daney <ddaney.cavm@...il.com>, Tejun Heo <tj@...nel.org>
Subject: linux-next: manual merge of the akpm tree with the memblock tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/mips/Kconfig between commit 9d15ffc824a9 ("mips: Use
HAVE_MEMBLOCK_NODE_MAP") from the memblock tree and commit "MIPS:
randomize PIE load address" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/mips/Kconfig
index 7639c77,c2911b7..0000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -25,9 -25,7 +25,10 @@@ config MIP
  	select GENERIC_IRQ_SHOW
  	select HAVE_ARCH_JUMP_LABEL
  	select IRQ_FORCED_THREADING
 +	select HAVE_MEMBLOCK
 +	select HAVE_MEMBLOCK_NODE_MAP
 +	select ARCH_DISCARD_MEMBLOCK
+ 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
  
  menu "Machine selection"
  

Content of type "application/pgp-signature" skipped