Hi all,
Today's linux-next merge of the kmemcheck tree got a conflict in
arch/x86/Kconfig between commit 2e9f3bddcbc711bb14d86c6f068a779bf3710247
("bzip2/lzma: make config machinery an arch configurable") from the x86
tree and commit 7df4b20d10108f0c1aa08ed3a7c0bfd9b9014562 ("kmemcheck:
make kconfig accessible for other architectures") from the kmemcheck tree.
Just simple overlapping additions. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/Kconfig
index 5f50c50,467bacc..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -41,9 -40,7 +41,10 @@@ config X8
select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
select USER_STACKTRACE_SUPPORT
+ select HAVE_KERNEL_GZIP
+ select HAVE_KERNEL_BZIP2
+ select HAVE_KERNEL_LZMA
+ select HAVE_ARCH_KMEMCHECK
config ARCH_DEFCONFIG
string
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
