LKML Archive on
help / color / mirror / Atom feed
* [PATCH -mmotm] one more reject fix in arch/x86/Kconfig
@ 2008-02-16 19:05 Erez Zadok
  0 siblings, 0 replies; only message in thread
From: Erez Zadok @ 2008-02-16 19:05 UTC (permalink / raw)
  To: Andrew Morton, Ingo Molnar, Thomas Gleixner; +Cc: linux-kernel

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/
  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).


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
-<<<<<<< HEAD:arch/x86/Kconfig
 	select HAVE_KVM
 	select HAVE_FTRACE
->>>>>>> FETCH_HEAD:arch/x86/Kconfig
 	def_bool n

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-02-16 19:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-16 19:05 [PATCH -mmotm] one more reject fix in arch/x86/Kconfig Erez Zadok

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).