Stephen Rothwell
2011-Sep-23 04:22 UTC
[Xen-devel] linux-next: manual merge of the xen-two tree with the xen tree
Hi Konrad,
Today''s linux-next merge of the xen-two tree got a conflict in
arch/x86/xen/Kconfig between commit 430bdcaf0b96 ("xen: add CPU microcode
update driver") from the xen tree and commit 10fe570fc167 ("Revert
"xen/debug: WARN_ON when identity PFN has no _PAGE_IOMAP flag
set."")
from the xen-two tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
[Jeremy: the xen patch is missing a new-line at the end of the file ...]
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/xen/Kconfig
index c5d7ccb,ae559fe..0000000
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@@ -49,15 -49,3 +49,7 @@@ config XEN_DEBUG_F
help
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
++ depends on XEN_DOM0 && MICROCODE
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel