From owner-freebsd-current@FreeBSD.ORG Fri Sep 19 04:16:48 2008 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96D2E1065677 for ; Fri, 19 Sep 2008 04:16:48 +0000 (UTC) (envelope-from deischen@freebsd.org) Received: from mail.netplex.net (mail.netplex.net [204.213.176.10]) by mx1.freebsd.org (Postfix) with ESMTP id 3810B8FC13 for ; Fri, 19 Sep 2008 04:16:42 +0000 (UTC) (envelope-from deischen@freebsd.org) Received: from sea.ntplx.net (sea.ntplx.net [204.213.176.11]) by mail.netplex.net (8.14.3/8.14.3/NETPLEX) with ESMTP id m8J4GfGt015276; Fri, 19 Sep 2008 00:16:41 -0400 (EDT) X-Virus-Scanned: by AMaViS and Clam AntiVirus (mail.netplex.net) X-Greylist: Message whitelisted by DRAC access database, not delayed by milter-greylist-4.0 (mail.netplex.net [204.213.176.10]); Fri, 19 Sep 2008 00:16:41 -0400 (EDT) Date: Fri, 19 Sep 2008 00:16:41 -0400 (EDT) From: Daniel Eischen X-X-Sender: eischen@sea.ntplx.net To: Maksim Yevmenkin In-Reply-To: Message-ID: References: <200809180023.m8I0NEJY032390@freefall.freebsd.org> <20080918195049.GQ39652@deviant.kiev.zoral.com.ua> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Kostik Belousov , current@freebsd.org Subject: Re: Fwd: Pending MFC Reminder [cvs commit: src/lib/libc/uuid Symbol.map] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Daniel Eischen List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Sep 2008 04:16:48 -0000 On Thu, 18 Sep 2008, Maksim Yevmenkin wrote: >> > emax 2008-09-15 23:54:55 UTC >> > >> > FreeBSD src repository >> > >> > Modified files: >> > lib/libc/uuid Symbol.map >> > Log: >> > SVN rev 183058 on 2008-09-15 23:54:55Z by emax >> > >> > Add uuid_enc,dec_le,be() functions to Symbol.map >> > Pointy hat goes to me. >> > >> > MFC after: 3 days >> > >> > Revision Changes Path >> > 1.3 +4 -0 src/lib/libc/uuid/Symbol.map >> >> >> I has a question against original commit, that I missed when reading >> commit mail. Why the new symbols introduced after 7.0 is released, >> where added to the FBSD_1.0 version ? I think FBSD_1.1 is correct >> there. >> >> Do you object ? Any symbols added to HEAD (8.x) go in FBSD_1.1. Symbols in HEAD always go to the latest version which is FBSD_1.1. Any symbols that are MFC'd, have to go to the _same_ version as they went to in HEAD (FBSD_1.1). What you must not do is MFC symbols to a different version in 7.x (or, more generally, any previous release/branch) than the version from which they came. If newfoo is in FBSD_1.1 in HEAD, then it has to be in FBSD_1.1 in 7.x. If you want to get picky and keep all 7.x versions in FBSD_1.0.x, then you first have to add FBSD_1.0.x in HEAD and add the symbols there. But that has not been the convention to date. Remember that all symbols and versions in 7.x _must_ be present in HEAD before they are MFC'd. HEAD is always a superset of 7.x. If you have added something to 7.x that doesn't exist in the same version as HEAD (in this case, FBSD_1.1), then please back it out and correct it. -- DE