linux-next: manual merge of the xen tree with Linus' tree

[Stephen Rothwell]

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

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

Attachment: pgp00000.pgp
Description: PGP signature