* linux-next: manual merge of the akpm tree with the memblock tree
@ 2011-12-09 4:57 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-12-09 4:57 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, David Daney, Tejun Heo
[-- Attachment #1: Type: text/plain, Size: 800 bytes --]
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@canb.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"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-09 4:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-09 4:57 linux-next: manual merge of the akpm tree with the memblock tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).