Using mmotm-2008-02-15-11-03, I get
$ make ARCH=i386
HOSTCC scripts/kconfig/conf.o
HOSTCC scripts/kconfig/kxgettext.o
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf -s arch/x86/Kconfig
arch/x86/Kconfig:24: unknown option "HEAD"
arch/x86/Kconfig:30: unknown option "FETCH_HEAD"
make[2]: *** [silentoldconfig] Error 1
make[1]: *** [silentoldconfig] Error 2
make: *** No rule to make target `include/config/auto.conf', needed by `include/config/kernel.release'. Stop.
The following small patch fixes it for me, but may not be the right fix (I
chose to resolve the conflict by including both parts).
Cheers,
Erez.
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6d6150b..dd4d64d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -21,13 +21,9 @@ config X86
select HAVE_IDE
select HAVE_OPROFILE
select HAVE_KPROBES
-<<<<<<< HEAD:arch/x86/Kconfig
select HAVE_KVM
select HAVE_ARCH_KGDB
-
-=======
select HAVE_FTRACE
->>>>>>> FETCH_HEAD:arch/x86/Kconfig
config GENERIC_LOCKBREAK
def_bool n