Date: Wed, 13 Jun 2018 23:21:53 -0600 From: Warner Losh <imp@bsdimp.com> To: "Rodney W. Grimes" <rgrimes@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r335091 - head/sbin/nvmecontrol Message-ID: <CANCZdfrgHLqmR=Yyvcc_3vRXFLcAN7nJ8CKDrU29U77XZF1EqQ@mail.gmail.com> In-Reply-To: <201806140457.w5E4vpEA042985@pdx.rh.CN85.dnsmgr.net> References: <CANCZdfrynxswb3d-oTwHJ0OGf2H8ibLwim7mg2iHavTXnDVPrg@mail.gmail.com> <201806140457.w5E4vpEA042985@pdx.rh.CN85.dnsmgr.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <imp@bsdimp.com> 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 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrgHLqmR=Yyvcc_3vRXFLcAN7nJ8CKDrU29U77XZF1EqQ>