From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 23:16:39 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v2.6.37-rc1~51
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=51399a391940e676877c7a791138081f13a0bab7

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)
  kbuild: convert `arch/tile' to the kconfig mainmenu upgrade
  README: cite nconfig
  Revert "kconfig: Temporarily disable dependency warnings"
  kconfig: Use PATH_MAX instead of 128 for path buffer sizes.
  kconfig: Fix realloc usage()
  kconfig: Propagate const
  kconfig: Don't go out from read config loop when you read new symbol
  kconfig: fix menuconfig on debian lenny
  kbuild: migrate all arch to the kconfig mainmenu upgrade
  kconfig: expand file names
  kconfig: use the file's name of sourced file
  kconfig: constify file name
  kconfig: don't emit warning upon rootmenu's prompt redefinition
  kconfig: replace KERNELVERSION usage by the mainmenu's prompt
  kconfig: delay gconf window initialization
  kconfig: expand by default the rootmenu's prompt
  kconfig: add a symbol string expansion helper
  kconfig: regen parser
  kconfig: implement the `mainmenu' directive
  kconfig: allow PACKAGE to be defined on the compiler's command-line
  ...

Fix up trivial conflict in arch/mn10300/Kconfig
---

51399a391940e676877c7a791138081f13a0bab7
diff --cc arch/mips/Kconfig
index 46cae2b163e,9f617417c0a..cf8d0945530
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -13,10 -13,7 +13,8 @@@ config MIP
  	select HAVE_KPROBES
  	select HAVE_KRETPROBES
  	select RTC_LIB if !MACH_LOONGSON
 +	select GENERIC_ATOMIC64 if !64BIT
  
- mainmenu "Linux/MIPS Kernel Configuration"
- 
  menu "Machine selection"
  
  config ZONE_DMA
diff --cc arch/mn10300/Kconfig
index 365766a3d53,ba8bd665ba4..41ba38513c8
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@@ -93,8 -55,10 +86,6 @@@ config GENERIC_HARDIRQ
  config HOTPLUG_CPU
  	def_bool n
  
- mainmenu "Panasonic MN10300/AM33 Kernel Configuration"
 -config HZ
 -	int
 -	default 1000
--
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"