From owner-svn-src-head@freebsd.org Sat Dec 30 15:55:20 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 25B3BE9F006 for ; Sat, 30 Dec 2017 15:55:20 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from sonic309-34.consmr.mail.ne1.yahoo.com (sonic309-34.consmr.mail.ne1.yahoo.com [66.163.184.160]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE18F114B for ; Sat, 30 Dec 2017 15:55:19 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1514649319; bh=w7rQ4HSQ1eodt/y1fm/Rk7OD1wS+t5yhYVuzpASAkbw=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From:Subject; b=DcB16v+9RhR7ShuS52ArXZ9rn/CuVm3IbC0PReOOxxjWogOKC/AYy8QhDB+OysbUsGp3EIHno2PQZy2XL956mg66VtE45XE0VClv+VAlx/iS/6JGjcxpOrwOK2KYj1yHuHVoD2DkECHHZ4ns93lVwZCn0XpYX7uUxJyFyqShwbf0wM+8ecZvBb+WqjCzvjmZYJz/J919LEe9dL0Fg6v4VPnVtQDbkp74NX4GBDXQx3ndtFrqi3fYMr+R7cxjQfIQEMojhxfn9uT+dEMpDLOU6vKAn6K3o1atbWyvy1LB83NNtkuCE3tcs0HCccIttNp2RTk9STBCa9sD2tkX7FxT7A== X-YMail-OSG: PVpG6XAVM1n0x2tc3NtT3T2dVmkAvOPElrK5ckdJr1Yjni6lU5WHk5X6XejjvJs bxMY4Otsq8.e653q5E2KHtpjHbO1U_oLprB1AdrL4N4yZ6V6G2_Dh1EGRJ8o0r2upXNr8NkKoMZV 8ui_31HYmPGwgrnqH1OMHAj6Y0PVEiSylUqUt.hQYSjn8tIlYTF44v8daMWp2O2C6hCT.HN_LNXo gD_llJT79HVS7uTZhRrhC5MVSPy2nUZHxHRFo60Xyyx6FciCApfe3GvKswEaKWbfbdx2EehL4YHb d3jy1NZ6vTMVKplR6vlpDmVYemu7wnzUMIVx.IE6XMn63C_JTdiU..6PLObh3pDNjiVL.UOitH0I mN2YjwaCuq7Lh.J0bu5s6HeCQexI2P3ZjyCPoxIssgxRu..QOigZFTotL6y.SrSp6g6aVFzgyU8g u7vDcVhGiIGZHcJOTShjYUQmq0Bu9U46sJJN7IJkcPD4iBsKLGxS5pswLkz6xNK1YUu3wxq43 Received: from sonic.gate.mail.ne1.yahoo.com by sonic309.consmr.mail.ne1.yahoo.com with HTTP; Sat, 30 Dec 2017 15:55:19 +0000 Received: from smtpgate103.mail.ne1.yahoo.com (EHLO [192.168.0.6]) ([216.155.193.162]) by smtp410.mail.ne1.yahoo.com (JAMES SMTP Server ) with ESMTPA ID e49af0816748731c493fa52bd47013e9; Sat, 30 Dec 2017 15:35:05 +0000 (UTC) Subject: Re: svn commit: r327370 - head/sbin/ccdconfig To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201712301514.vBUFEubp076296@pdx.rh.CN85.dnsmgr.net> From: Pedro Giffuni Message-ID: <6c95d594-83ff-0b35-55d9-69293362cb29@FreeBSD.org> Date: Sat, 30 Dec 2017 10:35:07 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <201712301514.vBUFEubp076296@pdx.rh.CN85.dnsmgr.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Dec 2017 15:55:20 -0000 On 12/30/17 10:14, Rodney W. Grimes wrote: >> Author: pfg >> Date: Sat Dec 30 00:26:42 2017 >> New Revision: 327370 >> URL: https://svnweb.freebsd.org/changeset/base/327370 >> >> Log: >> ccdconfig: Move VCS tags to be more consistent with our style. >> >> Update a now-bogus SPDX tag while here. >> >> Modified: >> head/sbin/ccdconfig/ccdconfig.8 >> head/sbin/ccdconfig/ccdconfig.c >> head/sbin/ccdconfig/pathnames.h >> >> Modified: head/sbin/ccdconfig/ccdconfig.8 >> ============================================================================== >> --- head/sbin/ccdconfig/ccdconfig.8 Sat Dec 30 00:24:53 2017 (r327369) >> +++ head/sbin/ccdconfig/ccdconfig.8 Sat Dec 30 00:26:42 2017 (r327370) >> @@ -1,5 +1,3 @@ >> -.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ >> -.\" >> .\" Copyright (c) 1996 The NetBSD Foundation, Inc. >> .\" All rights reserved. >> .\" >> @@ -27,6 +25,7 @@ >> .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> .\" SUCH DAMAGE. >> .\" >> +.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ > Obtained from: NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24) > > So now this confuses me, you just claimed to have pulled in ccdconfig 1.24 > changes yet our NetBSD tag is still 1.4??? Yes, this is tricky ... see below. > >> .\" $FreeBSD$ >> .\" >> .Dd October 3, 2016 >> >> Modified: head/sbin/ccdconfig/ccdconfig.c >> ============================================================================== >> --- head/sbin/ccdconfig/ccdconfig.c Sat Dec 30 00:24:53 2017 (r327369) >> +++ head/sbin/ccdconfig/ccdconfig.c Sat Dec 30 00:26:42 2017 (r327370) >> @@ -1,7 +1, >>> */ >>> >>> #include >>> >>> Modified: head/sbin/ccdconfig/pathnames.h >>> ============================================================================== >>> --- head/sbin/ccdconfig/pathnames.h Sat Dec 30 00:24:53 2017 (r327369) >>> +++ head/sbin/ccdconfig/pathnames.h Sat Dec 30 00:26:42 2017 (r327370) >>> @@ -1,5 +1,3 @@ >>> -/* $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $ */ >>> - >>> /*- >>> * SPDX-License-Identifier: BSD-2-Clause-NetBSD >>> * >>> @@ -30,6 +28,7 @@ >>> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE >>> * POSSIBILITY OF SUCH DAMAGE. >>> * >>> + * $NetBSD: pathnames.h,v 1.4 2008/04/28 20:23:07 martin Exp $ >>> * $FreeBSD$ >>> */ >>> >>> >>> >> 5 @@ >> -/* $NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */ >> - >> /*- >> - * SPDX-License-Identifier: BSD-4-Clause >> + * SPDX-License-Identifier: BSD-2-Clause >> * >> * Copyright (c) 2003 Poul-Henning Kamp >> * Copyright (c) 1996 The NetBSD Foundation, Inc. >> @@ -30,6 +28,8 @@ >> * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) >> * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE >> * POSSIBILITY OF SUCH DAMAGE. >> + * >> + * NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ > Obtained from: NetBSD (CVS ccdconfig.c 1.47, ccdconfig.8 1.24) > > Ditto on 1.6 vs 1.47 > We regularly only update the VCS tags when the code matches both OSs. It is basically an indicator of when our code started diverging. This doesn't really stop us from bringing to the tree other changes/fixes that may be relevant even if that means skipping unrelated changes. In the case of these files, NetBSD made many changes that are not relevant to us (changed the bus API, for example) so bumping the versions of these files would be misguiding. If, for example, someone wants to merge the API changes in a future, it is still important to know where the divergence started. For relicensing, one has to be careful that the relicensed code covers the existing code in our files. Ichecked that none of the changes between the last merged version and the TNF copyright assignment is relevant to us. Pedro.