From owner-svn-src-head@freebsd.org Thu Jun 14 05:21:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71EEC10225C2 for ; Thu, 14 Jun 2018 05:21:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-it0-x22a.google.com (mail-it0-x22a.google.com [IPv6:2607:f8b0:4001:c0b::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 99F717320F for ; Thu, 14 Jun 2018 05:21:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-it0-x22a.google.com with SMTP id j135-v6so7055608itj.1 for ; Wed, 13 Jun 2018 22:21:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=OlO3uj4tPx3I4kdzzfAajofVjoXDY60vMZNLkFfuD1c=; b=oJ/FnMiPLxW9ovQGeZn8oj3zdxA5UMafyHu/hdan9h7cl9wes2eNCIf0J8wX8KbITr MEjPpf95/8lnl034koS/fix5xdEdejC1mULIDyc2olC/cWTSwxIfP8ppopnmMenFNnia B4DXziYu++EQ4aUoPcnbGDbKB6O9OjAJLXlwmZCgKQP3vToc/GZMiq4UChgzBa9FX8F5 apTai+FxGBOZ2E8/VaThnm+SY/tqUl14TFnCYEOe4AwsK28NYJnah1FBcWKIVt+b73Uy 3a4IcLB81G2oNMEwPRWkynrLyUOW1y9kVxkOqQdbCPLlogKHPgfbOBUTzF2DKhattCVK 3CBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=OlO3uj4tPx3I4kdzzfAajofVjoXDY60vMZNLkFfuD1c=; b=sPabeZ2fy4jMZuU8y0ogGBVtJ6vn8VfO9fNmUUndMYF0oGrZIGytyF7bDF8XHm8lq0 cpQPalYVXLydrawgOBjSmhog8TSSPwxnS13vYwfN3RQj2JfBSo8IQyKyhLL2Jwy8sa8n i3enUFjxsLkKESI4SfLUgXaHoG3zzJdDhyGHi+Yu2vpy1LcQGpuuIHfmtLt2shpT7wfG KN2/c1pWVaOCIdaQ2POv2jZvCxLKLLYvWu8WptEAHJGue6eb6RavraOOPW9q9489ELsF ABQZHL3jqYUtc/AVk/YGbgpqFnzt/TiA3uSS21ZEZqaqUbTYRQ/zMtwujYs0t1408hOP mwhQ== X-Gm-Message-State: APt69E0FceOXiI89L9559oI8cz8+JfzbVF9oEI3g17U6SK+pCyikZGJI cMXaIJdYQ21nZg0r4WIvABMBqI2KyHSNfxCDnwsV1Q== X-Google-Smtp-Source: ADUXVKIqlHLjPJ7sEvCvUvaBmh9r90lA8ca64qOa03I4hHRAYCnJ/Qb+gi7mxL96JkNkEq8WYDDXVOMvXLDolqfnuxo= X-Received: by 2002:a24:7c8d:: with SMTP id a135-v6mr867032itd.73.1528953713740; Wed, 13 Jun 2018 22:21:53 -0700 (PDT) MIME-Version: 1.0 Sender: wlosh@bsdimp.com Received: by 2002:a4f:d028:0:0:0:0:0 with HTTP; Wed, 13 Jun 2018 22:21:53 -0700 (PDT) X-Originating-IP: [2603:300b:6:5100:1052:acc7:f9de:2b6d] In-Reply-To: <201806140457.w5E4vpEA042985@pdx.rh.CN85.dnsmgr.net> References: <201806140457.w5E4vpEA042985@pdx.rh.CN85.dnsmgr.net> From: Warner Losh Date: Wed, 13 Jun 2018 23:21:53 -0600 X-Google-Sender-Auth: VaAEPgy_90TjJeVvX7ZBTc6FFNM Message-ID: Subject: Re: svn commit: r335091 - head/sbin/nvmecontrol To: "Rodney W. Grimes" Cc: Warner Losh , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.26 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 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: Thu, 14 Jun 2018 05:21:55 -0000 On Wed, Jun 13, 2018 at 10:57 PM, Rodney W. Grimes < freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > [ Charset UTF-8 unsupported, converting... ] > > Actually, that file (nvmecontrol_ext.h) is completely new. I'm not sure > why > > it thought I copied it from util.c. Maybe it's a git svn integration > thing. > > If it is a totally new file why is it showing contect diff with > + and -'s? Don't know, but the whole contents of this file is 1 line of extern function statements. Since util.c is short, and I try to use identical copyright notices, I'm thinking git thought it was a move through 'magic' and that's where svn got confused into thinking it was a copy + modification which is where the diff came from. Warner > > Warner > > > > On Wed, Jun 13, 2018 at 9:31 PM, Warner Losh wrote: > > > > > Ah, that's what you were talking about. OK. Will do. > > > > > > Warner > > > > > > On Wed, Jun 13, 2018 at 9:28 PM, Rodney W. Grimes < > > > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > > > > >> > On Wed, Jun 13, 2018 at 9:03 PM, Rodney W. Grimes < > > >> > freebsd@pdx.rh.cn85.dnsmgr.net> wrote: > > >> > > > >> > > > Author: imp > > >> > > > Date: Wed Jun 13 22:00:02 2018 > > >> > > > New Revision: 335091 > > >> > > > URL: https://svnweb.freebsd.org/changeset/base/335091 > > >> > > > > > >> > > > Log: > > >> > > > Make it possible to use print_controller from another program > > >> > > > > > >> > > > Rename print_controller to nvme_print_controller. Put it in > its > > >> > > > own file for easy inclusion. Move util.c to be nc_util.c to > not > > >> > > > conflict with camcontrol. add nvecontrol_ext.h to define > shared > > >> > > > interfaces. > > >> > > > > > >> > > > Sponsored by: Netflix > > >> > > > Differential Revision: https://reviews.freebsd.org/D15371 > > >> > > > > > >> > > > Added: > > >> > > > head/sbin/nvmecontrol/identify_ext.c > > >> > > > - copied, changed from r335089, > head/sbin/nvmecontrol/identify > > >> .c > > >> > > > head/sbin/nvmecontrol/nc_util.c > > >> > > > - copied, changed from r335089, > head/sbin/nvmecontrol/util.c > > >> > > > head/sbin/nvmecontrol/nvmecontrol_ext.h (contents, props > > >> changed) > > >> > > > - copied, changed from r335089, > head/sbin/nvmecontrol/util.c > > >> > > ... > > >> > > > > >> > > > > > >> > > > Copied and modified: head/sbin/nvmecontrol/nvmecontrol_ext.h > (from > > >> > > r335089, head/sbin/nvmecontrol/util.c) > > >> > > > ============================================================ > > >> > > ================== > > >> > > > --- head/sbin/nvmecontrol/util.c Wed Jun 13 21:10:23 2018 > > >> > > (r335089, copy source) > > >> > > > +++ head/sbin/nvmecontrol/nvmecontrol_ext.h Wed Jun 13 > 22:00:02 > > >> 2018 > > >> > > (r335091) > > >> > > > @@ -1,7 +1,8 @@ > > >> > > > /*- > > >> > > > - * Copyright (c) 2017 Netflix, Inc > > >> > > > - * All rights reserved. > > >> > > > + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD > > >> > > > * > > >> > > > + * Copyright (C) 2018 Netflix > > >> > > > > >> > > You moved a copyright forward, that is not proper to do. > > >> > > > > >> > > > >> > Thought it was. I honestly don't care where (nor does my employer), > so > > >> if > > >> > you want to tweak it to be more conforming, be my guest. > > >> > > >> You can add a new date to the end of a list, but you should always > > >> retain the oldest date, and many opinions are that all dates should > > >> be retained unless they are continuous. > > >> > > >> It would be much simpler for you to commit: > > >> - * Copyright (C) 2018 Netflix > > >> + * Copyright (C) 2017-2018 Netflix > > >> > > >> Than for me to get approval: bde, phk. > > >> > > >> Thanks. > > >> Rod > > >> > > >> > > > >> > > Not sure about dropping the , Inc either. > > >> > > > >> > > > >> > Doesn't matter. Different Netflix committers do different things > and I > > >> was > > >> > trying to move towards uniformity. > > >> > > >> Ok > > >> > > >> > Warner > > >> > > >> -- > > >> Rod Grimes > > >> rgrimes@freebsd.org > > >> > > > > > > > > -- > Rod Grimes > rgrimes@freebsd.org >