linux-kernel - linux-next: manual merge of the memblock tree with the vhost 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]

Message-Id: <20111206141255.22281e0c2ff454259238d5a0@canb.auug.org.au>
Date:	Tue, 6 Dec 2011 14:12:55 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Michael S. Tsirkin" <mst@...hat.com>
Subject: linux-next: manual merge of the memblock tree with the vhost tree

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@...b.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"

Content of type "application/pgp-signature" skipped