* linux-next: manual merge of the memblock tree with the vhost tree
@ 2011-12-06 3:12 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-12-06 3:12 UTC (permalink / raw)
To: Tejun Heo; +Cc: linux-next, linux-kernel, Michael S. Tsirkin
[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]
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/score/Kconfig between commit 4673ca8eb369 ("lib: move GENERIC_IOMAP
to lib/Kconfig") from the vhost tree and commit 77bd85cae44e ("score: Use
HAVE_MEMBLOCK_NODE_MAP") from the memblock tree.
Just context changes (and white space). I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/score/Kconfig
index 455ce2d,1b4d02b..0000000
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@@ -1,10 -1,12 +1,13 @@@
menu "Machine selection"
config SCORE
- def_bool y
- select HAVE_GENERIC_HARDIRQS
- select GENERIC_IRQ_SHOW
- select GENERIC_IOMAP
+ def_bool y
+ select HAVE_GENERIC_HARDIRQS
+ select GENERIC_IRQ_SHOW
+ select HAVE_MEMBLOCK
+ select HAVE_MEMBLOCK_NODE_MAP
+ select ARCH_DISCARD_MEMBLOCK
++ select GENERIC_IOMAP
choice
prompt "System type"
[-- 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-06 3:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-06 3:12 linux-next: manual merge of the memblock tree with the vhost 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).