From f45dec14451b76c88404003a6940123172329a65 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@mindspring.com>
Date: Tue, 12 Sep 2006 12:38:19 -0400
Subject: [PATCH] --- yaml --- r: 35455 b: refs/heads/master c:
 1ef988569051d47e990fe5bbea22fb9b64152098 h: refs/heads/master i:   35453:
 9cc832180fab5cc983e31985809d07a4c3c759a9   35451:
 8ff4760c82fd6e614208d2445a5183e53f8624be   35447:
 8f44093e037ce2d78b8355745ed095a34dc868dd   35439:
 f249cfb12b2d342c758ccb0025b6bc7c60a2b3e5   35423:
 0ece247f5333f7052cfdce5cf6cd7a6888e4aa83   35391:
 bbed0aaa32f5c0ea1c2e778fb708439fec51f048   35327:
 b57adbb8783001bd85f300d45fa3a306d9f95a9b v: v3

---
 [refs]         |  2 +-
 trunk/Makefile | 32 +++++++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a80ee61d9b91..3b9c83d0623c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e99f3190f274c6783758ff511edb64e60753c9f
+refs/heads/master: 1ef988569051d47e990fe5bbea22fb9b64152098
diff --git a/trunk/Makefile b/trunk/Makefile
index 13bc589c6056..241fed3a74a6 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -760,12 +760,34 @@ $(vmlinux-dirs): prepare scripts
 	$(Q)$(MAKE) $(build)=$@
 
 # Build the kernel release string
-# The KERNELRELEASE is stored in a file named include/config/kernel.release
-# to be used when executing for example make install or make modules_install
 #
-# Take the contents of any files called localversion* and the config
-# variable CONFIG_LOCALVERSION and append them to KERNELRELEASE.
-# LOCALVERSION from the command line override all of this
+# The KERNELRELEASE value built here is stored in the file
+# include/config/kernel.release, and is used when executing several
+# make targets, such as "make install" or "make modules_install."
+#
+# The eventual kernel release string consists of the following fields,
+# shown in a hierarchical format to show how smaller parts are concatenated
+# to form the larger and final value, with values coming from places like
+# the Makefile, kernel config options, make command line options and/or
+# SCM tag information.
+#
+#	$(KERNELVERSION)
+#	  $(VERSION)			eg, 2
+#	  $(PATCHLEVEL)			eg, 6
+#	  $(SUBLEVEL)			eg, 18
+#	  $(EXTRAVERSION)		eg, -rc6
+#	$(localver-full)
+#	  $(localver)
+#	    localversion*		(all localversion* files)
+#	    $(CONFIG_LOCALVERSION)	(from kernel config setting)
+#	  $(localver-auto)		(only if CONFIG_LOCALVERSION_AUTO is set)
+#	    ./scripts/setlocalversion	(SCM tag, if one exists)
+#	    $(LOCALVERSION)		(from make command line if provided)
+#
+#  Note how the final $(localver-auto) string is included *only* if the
+# kernel config option CONFIG_LOCALVERSION_AUTO is selected.  Also, at the
+# moment, only git is supported but other SCMs can edit the script
+# scripts/setlocalversion and add the appropriate checks as needed.
 
 nullstring :=
 space      := $(nullstring) # end of line