Re: [PATCH 1/2] COPYING: create a new file with points to the Kernel license files
Em Thu, 22 Mar 2018 05:13:55 -0700 Matthew Wilcoxescreveu: > On Thu, Mar 22, 2018 at 06:54:13AM -0300, Mauro Carvalho Chehab wrote: > > +++ b/Documentation/process/license-rules.rst > > @@ -4,15 +4,17 @@ Linux kernel licensing rules > > > > > > The Linux Kernel is provided under the terms of the GNU General Public > > -License version 2 only (GPL-2.0), as published by the Free Software > > -Foundation, and provided in the COPYING file. This documentation file is > > -not meant to replace the COPYING file, but provides a description of how > > -each source file should be annotated to make the licensing it is governed > > -under clear and unambiguous. > > - > > -The license in the COPYING file applies to the kernel source as a whole, > > -though individual source files can have a different license which is > > -required to be compatible with the GPL-2.0:: > > +version 2 only (GPL-2.0), as written at LICENSES/preferred/GPL-2.0, > > ^^^ you dropped the word 'License' here > > Also, I think this should read "as provided in", not "as written at". > > > +with an explicit syscall exception described at > > s/at/in/ > > > +LICENSES/exceptions/Linux-syscall-note, as described in the COPYING file. > > This phrasing is awkward with "desribed" used twice in the same sentence ... > > > +This documentation file is not meant to replace the Kernel's license, > > +but provides a description of how each source file should be annotated > > +to make the licensing it is governed under clear and unambiguous. > > I'd rather this said: > > This documentation file provides a description of how each source file > should be annotated to make its license clear and unambiguous. Thanks for your review! I'll be submitting it again as a v2, with the following text at the license-rules.rst preamble: Linux kernel licensing rules The Linux Kernel is provided under the terms of the GNU General Public License version 2 only (GPL-2.0), as provided in LICENSES/preferred/GPL-2.0, with an explicit syscall exception described in LICENSES/exceptions/Linux-syscall-note, as described in the COPYING file. This documentation file provides a description of how each source file should be annotated to make its license clear and unambiguous. It doesn't replace the Kernel's license. The license described in the COPYING file applies to the kernel source as a whole, though individual source files can have a different license which is required to be compatible with the GPL-2.0:: Regards, Mauro > Thanks, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] COPYING: create a new file with points to the Kernel license files
On Thu, Mar 22, 2018 at 06:54:13AM -0300, Mauro Carvalho Chehab wrote: > +++ b/Documentation/process/license-rules.rst > @@ -4,15 +4,17 @@ Linux kernel licensing rules > > > The Linux Kernel is provided under the terms of the GNU General Public > -License version 2 only (GPL-2.0), as published by the Free Software > -Foundation, and provided in the COPYING file. This documentation file is > -not meant to replace the COPYING file, but provides a description of how > -each source file should be annotated to make the licensing it is governed > -under clear and unambiguous. > - > -The license in the COPYING file applies to the kernel source as a whole, > -though individual source files can have a different license which is > -required to be compatible with the GPL-2.0:: > +version 2 only (GPL-2.0), as written at LICENSES/preferred/GPL-2.0, ^^^ you dropped the word 'License' here Also, I think this should read "as provided in", not "as written at". > +with an explicit syscall exception described at s/at/in/ > +LICENSES/exceptions/Linux-syscall-note, as described in the COPYING file. This phrasing is awkward with "desribed" used twice in the same sentence ... > +This documentation file is not meant to replace the Kernel's license, > +but provides a description of how each source file should be annotated > +to make the licensing it is governed under clear and unambiguous. I'd rather this said: This documentation file provides a description of how each source file should be annotated to make its license clear and unambiguous. -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] COPYING: create a new file with points to the Kernel license files
On Thu, Mar 22, 2018 at 06:54:13AM -0300, Mauro Carvalho Chehab wrote: > With the addition of SPDX patchset, the contents of COPYING file > is now duplicated at two other files under LICENSE: > LICENSES/preferred/GPL-2.0 > LICENSES/exceptions/Linux-syscall-note > > It is easy to check that the contents of the licence written on > those files are identical with COPYING using: > > $ diff -upr COPYING LICENSES/preferred/GPL-2.0 > $ diff -upr COPYING LICENSES/exceptions/Linux-syscall-note|less > > Also, a new file was added, with describes how SPDX should work at > the Kernel source files: > Documentation/process/license-rules.rst > > Instead fo having it copying the contents of two files, and not > even mentioning the third one, replace it by a file whose content > points to the other tree files, preserving the Kernel's license. > > Adjust license-rules.rst accordingly. > > Please notice that this file preserves the Kernel license as > is, without any changes. > > Signed-off-by: Mauro Carvalho ChehabReviewed-by: Greg Kroah-Hartman -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html