On Mon, Jan 22, 2018 at 01:49:19PM -0800, Michel Thierry wrote: > > > > diff --git a/drivers/gpu/drm/i915/intel_lrc_reg.h > > > > b/drivers/gpu/drm/i915/intel_lrc_reg.h > > > > new file mode 100644 > > > > index 000000000000..f50d63cb4b66 > > > > --- /dev/null > > > > +++ b/drivers/gpu/drm/i915/intel_lrc_reg.h > > > > @@ -0,0 +1,78 @@ > > > > +/* SPDX-License-Identifier: MIT */ > > > > +/* > > > > + * Copyright © 2018 Intel Corporation > > ^^^^ > > hmm, maybe years should be "2014-2018" > > > > 2014 because that's when these #define were originally added? Because that's what is in the copyright line in that file I suppose. > > > > > + * > > > > + * Permission is hereby granted, free of charge, to any person > > > > obtaining a > > > > + * copy of this software and associated documentation files > > > > (the "Software"), > > > > + * to deal in the Software without restriction, including > > > > without limitation > > > > + * the rights to use, copy, modify, merge, publish, distribute, > > > > sublicense, > > > > + * and/or sell copies of the Software, and to permit persons to > > > > whom the > > > > + * Software is furnished to do so, subject to the following conditions: > > > > + * > > > > + * The above copyright notice and this permission notice > > > > (including the next > > > > + * paragraph) shall be included in all copies or substantial > > > > portions of the > > > > + * Software. > > > > + * > > > > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY > > > > KIND, EXPRESS OR > > > > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF > > > > MERCHANTABILITY, > > > > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO > > > > EVENT SHALL > > > > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, > > > > DAMAGES OR OTHER > > > > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR > > > > OTHERWISE, ARISING > > > > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > > > > + * DEALINGS IN THE SOFTWARE. > > > > + */ > > > > > > Looking at other files added after the SPDX change, it doesn't look > > > like we should duplicate the information about license. So in this case > > > AFAIU it should contain only the SPDX tag and the Copyright, but not > > > license text. See > > > > > > git log --grep "Remove redundant license text" > > > > > > > > > Lucas De Marchi > > > > > > > and by looking at other examples I think best practice is to put this tag > > right under a copyright line: > > > > /* > > * Copyright © 2014-2018 Intel Corporation > > * > > * SPDX-License-Identifier: MIT > > */ > > > > Best practice, but not the most common: > > $ git grep " \* SPDX-License-Identifier:" |wc -l > 94 > > $ git grep "/\* SPDX-License-Identifier:" |wc -l > 7822 > > Anyway it looks ok to me, objections? I remember Linus stating his preference for `// SPDX ... ' as the first line. The copyright could then follow the comment format. Searching now I found this: https://lkml.org/lkml/2017/11/2/715 (and see the thread why it was used /* rather than // in headers... which as been fixed by 5cb0512c02ecd7e6214e912e4c150f4219ac78e0). So for this file what I understand is that it should be: // SPDX-License-Identifier: MIT // Copyright (C) 2014-2018 Intel Corporation Lucas De Marchi > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
