linux-next: manual merge of the memblock tree with the vhost tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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: pgp00000.pgp
Description: PGP signature