Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753109Ab0GQUEm (ORCPT ); Sat, 17 Jul 2010 16:04:42 -0400 Received: from smtp-out.google.com ([216.239.44.51]:1794 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217Ab0GQUEk (ORCPT ); Sat, 17 Jul 2010 16:04:40 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=date:from:x-x-sender:to:cc:subject:in-reply-to:message-id: references:user-agent:mime-version:content-type:x-system-of-record; b=Semk7GyFL004ZQzjxpGy5yx82Uryg1oVIzh1gpViUFxPX4As26wSjih6ePn6Wlt+B HVNmqpJLRUuidYtMW9ocg== Date: Sat, 17 Jul 2010 13:04:27 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Pete Zaitcev cc: linux-kbuild@vger.kernel.org, nico-linuxsetlocalversion@schottelius.org, linux-kernel@vger.kernel.org Subject: Re: I did a git pull and a plus appeared In-Reply-To: <20100716121802.65fdfa24@lembas.zaitcev.lan> Message-ID: References: <20100716121802.65fdfa24@lembas.zaitcev.lan> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1352 Lines: 32 On Fri, 16 Jul 2010, Pete Zaitcev wrote: > Dear All: > > I have a tree that existed for a few years (a clone of Linus' tree). > Today I did a git pull in it, and a plus appeared in the built version. > E.g. after "make modules_install": > > [root@niphredil linux-2.6-tip]# ls /lib/modules/ > 2.6.33.1-19.fc13.x86_64 2.6.34-rc6-tip 2.6.35-rc1-tip > 2.6.34-43.fc14.x86_64 2.6.35-0.36.rc4.git5.fc14.x86_64 2.6.35-rc5-tip+ > [root@niphredil linux-2.6-tip]# > > How do I get rid of the plus? I have (had for a long time): > > [zaitcev@niphredil linux-2.6-tip]$ grep LOCAL .config > CONFIG_LOCALVERSION="-tip" > # CONFIG_LOCALVERSION_AUTO is not set > CONFIG_X86_LOCAL_APIC=y > [zaitcev@niphredil linux-2.6-tip]$ > I initially added the `+' to the version string in 85a256d8 during this release cycle. As the changelog indicates, it means that your tree is beyond a tagged commit and LOCALVERSION= was not passed on the command line so the tree must be described as a modified 2.6.35-rc5 kernel, for example, instead of vanilla. That's the semantics that the `+' indicates. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/