All of lore.kernel.org
 help / color / mirror / Atom feed
From: Oliver Hartkopp <socketcan@hartkopp.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] Linux 3.8-merge version information
Date: Tue, 11 Dec 2012 20:33:42 +0100	[thread overview]
Message-ID: <50C78A96.8000705@hartkopp.net> (raw)
In-Reply-To: <CA+55aFyFfjAnD4hR2SpE2OK8_dtHPkt0sr4BKZPhp6P7NKpiwQ@mail.gmail.com>

Thanks for your explanation.

Indeed i was not really aware of commit counter as the first number, even if i
used CONFIG_LOCALVERSION_AUTO=y for a while now.

The obviously outdated Kconfig help of CONFIG_LOCALVERSION_AUTO told me:

	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
	appended after any matching localversion* files, and after the value
	set in CONFIG_LOCALVERSION.

	(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".)

Maybe you can integrate parts of your comprehensive answer into this help
text, as it will fit better than my awkward English %-)

Tnx & best regards,
Oliver


On 11.12.2012 19:57, Linus Torvalds wrote:

> On Tue, Dec 11, 2012 at 5:06 AM, Oliver Hartkopp <socketcan@hartkopp.net> wrote:
>> As the automatically generated git version information is misleading in the
>> merge window, name the kernel in the merge window as 3.8-merge .
> 
> This really doesn't help.
> 
> 90% of the commits during the merge window wouldn't be based on that
> Makefile change anyway, but on some much older version. So when
> bisecting, for example, you'll see Makefiles with much older version
> numbers, even though the commits got merged into the 3.8 merge window.
> 
> Also, we have code to generate the version number automatically. In
> particular, I encourage people to use git trees and
> CONFIG_LOCALVERSION_AUTO=y, because then your /var/log/messages (and
> uname -r) will contain the exact git version of your kernel. So when
> you see something like
> 
>     Linux version 3.7.0-rc8-00041-gcaf491916b1c
> 
> in your message log, you'll know that the kernel you were running back
> then was 41 commits past -rc8, and had git commit ID of caf491916b1c.
> And that is really useful for things like bisections ("Ok, I know it
> worked three days ago - what kernel was I running then?") much more so
> than a Makefile change would be (never mind how unreliable the version
> info in the makefile is).
> 
> So this is why we only change the version in the Makefile when we do a
> new tagged release.
> 
>                     Linus



  reply	other threads:[~2012-12-11 19:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-11 13:06 [PATCH] Linux 3.8-merge version information Oliver Hartkopp
2012-12-11 18:57 ` Linus Torvalds
2012-12-11 19:33   ` Oliver Hartkopp [this message]
2012-12-15 11:33   ` Pavel Machek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50C78A96.8000705@hartkopp.net \
    --to=socketcan@hartkopp.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.