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

Date:	Wed, 11 Jan 2012 14:57:09 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jeremy Fitzhardinge <jeremy@...p.org>,
	Xen Devel <Xen-devel@...ts.xensource.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
Subject: linux-next: manual merge of the xen tree with Linus' tree

Hi all,

Today's linux-next merge of the xen tree got a conflict in
arch/x86/xen/Kconfig between commit 10fe570fc167 ("Revert "xen/debug:
WARN_ON when identity PFN has no _PAGE_IOMAP flag set."") from Linus'
tree and commit 23757fb5d678 ("xen: add CPU microcode update driver")
from the xen tree.

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

diff --cc arch/x86/xen/Kconfig
index fdce49c,4d04d4f..0000000
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -50,3 -50,14 +50,6 @@@ config XEN_DEBUG_F
  	  Enable statistics output and various tuning options in debugfs.
  	  Enabling this option may incur a significant performance overhead.
  
 -config XEN_DEBUG
 -	bool "Enable Xen debug checks"
 -	depends on XEN
 -	default n
 -	help
 -	  Enable various WARN_ON checks in the Xen MMU code.
 -	  Enabling this option WILL incur a significant performance overhead.
 -
+ config MICROCODE_XEN
+        def_bool y
+        depends on XEN_DOM0 && MICROCODE

Content of type "application/pgp-signature" skipped