Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (38 commits)
  kconfig: fix mconf segmentation fault
  kbuild: enable use of code from a different dir
  kconfig: error out if recursive dependencies are found
  kbuild: scripts/basic/fixdep segfault on pathological string-o-death
  kconfig: correct minor typo in Kconfig warning message.
  kconfig: fix path to modules.txt in Kconfig help
  usr/Kconfig: fix typo
  kernel-doc: alphabetically-sorted entries in index.html of 'htmldocs'
  kbuild: be more explicit on missing .config file
  kbuild: clarify the creation of the LOCALVERSION_AUTO string.
  kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
  kconfig: refer to qt3 if we cannot find qt libraries
  kbuild: handle compressed cpio initramfs-es
  kbuild: ignore section mismatch warning for references from .paravirtprobe to .init.text
  kbuild: remove stale comment in modpost.c
  kbuild/mkuboot.sh: allow spaces in CROSS_COMPILE
  kbuild: fix make mrproper for Documentation/DocBook/man
  kbuild: remove kconfig binaries during make mrproper
  kconfig/menuconfig: do not hardcode '.config'
  kbuild: override build timestamp & version
  ...

2 files changed, 13 insertions, 9 deletions

diff --git a/init/Kconfig b/init/Kconfig
index b170aa1d43bd..29d9e47ee0da 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -80,16 +80,20 @@ config LOCALVERSION_AUTO
         default y
         help
           This will try to automatically determine if the current tree is a
-          release tree by looking for git tags that
-          belong to the current top of tree revision.
+          release tree by looking for git tags that belong to the current
+          top of tree revision.
 
           A string of the format -gxxxxxxxx will be added to the localversion
-          if a git based tree is found.  The string generated by this will be
+          if a git-based tree is found.  The string generated by this will be
           appended after any matching localversion* files, and after the value
-          set in CONFIG_LOCALVERSION
+          set in CONFIG_LOCALVERSION.
 
-          Note: This requires Perl, and a git repository, but not necessarily
-          the git or cogito tools to be installed.
+          (The actual string used here is the first eight characters produced
+          by running the command:
+
+            $ git rev-parse --verify HEAD
+
+          which is done within the script "scripts/setlocalversion".)
 
 config SWAP
         bool "Support for paging of anonymous memory (swap)"
diff --git a/init/main.c b/init/main.c
index 80f09f31bfab..df982ff5d2b0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -82,7 +82,7 @@
 #warning gcc-4.1.0 is known to miscompile the kernel.  A different compiler version is recommended.
 #endif
 
-static int init(void *);
+static int kernel_init(void *);
 
 extern void init_IRQ(void);
 extern void fork_init(unsigned long);
@@ -431,7 +431,7 @@ static void __init setup_command_line(char *command_line)
 static void noinline rest_init(void)
         __releases(kernel_lock)
 {
-        kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND);
+        kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
         numa_default_policy();
         unlock_kernel();
 
@@ -768,7 +768,7 @@ static int noinline init_post(void)
         panic("No init found.  Try passing init= option to kernel.");
 }
 
-static int __init init(void * unused)
+static int __init kernel_init(void * unused)
 {
         lock_kernel();
         /*