linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch V5 00/11] LICENSES: Add documentation and initial License files
@ 2017-12-28 15:27 Thomas Gleixner
  2017-12-28 15:27 ` [patch V5 01/11] Documentation: Add license-rules.rst to describe how to properly identify file licenses Thomas Gleixner
                   ` (11 more replies)
  0 siblings, 12 replies; 28+ messages in thread
From: Thomas Gleixner @ 2017-12-28 15:27 UTC (permalink / raw)
  To: LKML
  Cc: Linus Torvalds, Andrew Morton, Jonathan Corbet, Kate Stewart,
	Philippe Ombredanne, Greg Kroah-Hartman, Christoph Hellwig,
	Russell King, Rob Herring, Jonas Oberg, Joe Perches, linux-xfs,
	Charlemagne Lasse, Carmen Bianca Bakker, Darrick J. Wong,
	Heiko Carstens

This is the 5th version of the licensing rules documentation.

Changes since v4:

 - Made use of boilerplate consistently

 - Fixed the 'braces' inconsistency spotted by Heiko
 
 - Picked up Reviewed-by tags

Delta patch vs. V4 below.

Thanks to everyone who provided input!

Thanks,

        tglx

8<---------------
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -34,8 +34,8 @@ into any source files which create an ex
 kernel, the exception must be documented by a special license expression.
 
 The common way of expressing the license of a source file is to add the
-matching boiler plate text into the top comment of the file.  Due to
-formatting, typos etc. these "boiler plates" are hard to validate for
+matching boilerplate text into the top comment of the file.  Due to
+formatting, typos etc. these "boilerplates" are hard to validate for
 tools which are used in the context of license compliance.
 
 An alternative to boilerplate text is the use of Software Package Data
@@ -89,9 +89,11 @@ License identifier syntax
 3. Syntax:
 
    A <SPDX License Expression> is either an SPDX short form license
-   identifier found on the SPDX License List, or when multiple licenses
-   apply, an expression consisting of keywords "AND", "OR", and "WITH"
-   separating SPDX short form license identifiers surrounded by "(", ")".
+   identifier found on the SPDX License List, or the combination of two
+   SPDX short form license identifiers separated by "WITH" when a license
+   exception applies. When multiple licenses apply, an expression consists
+   of keywords "AND", "OR" separating sub-expressions and surrounded by
+   "(", ")" .
 
    License identifiers for licenses like [L]GPL with the 'or later' option
    are constructed by using a "+" for indicating the 'or later' option.::
@@ -102,13 +104,13 @@ License identifier syntax
    WITH should be used when there is a modifier to a license needed.
    For example, the linux kernel UAPI files use the expression::
 
-      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note)
-      // SPDX-License-Identifier: (GPL-2.0+ WITH Linux-syscall-note)
+      // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
+      // SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note
 
    Other examples using WITH exceptions found in the kernel are::
 
-      // SPDX-License-Identifier: (GPL-2.0 WITH mif-exception)
-      // SPDX-License-Identifier: (GPL-2.0+ WITH GCC-exception-2.0)
+      // SPDX-License-Identifier: GPL-2.0 WITH mif-exception
+      // SPDX-License-Identifier: GPL-2.0+ WITH GCC-exception-2.0
 
    Exceptions can only be used with particular License identifiers. The
    valid License identifiers are listed in the tags of the exception text
@@ -119,28 +121,28 @@ License identifier syntax
    to be selected.  For example, some dtsi files are available under dual
    licenses::
 
-      // SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+      // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 
    Examples from the kernel for license expressions in dual licensed files::
 
-      // SPDX-License-Identifier: (GPL-2.0 OR MIT)
-      // SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-      // SPDX-License-Identifier: (GPL-2.0 OR Apache-2.0)
-      // SPDX-License-Identifier: (GPL-2.0 OR MPL-1.1)
-      // SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR MIT)
-      // SPDX-License-Identifier: ((GPL-1.0+ OR BSD-3-Clause) OR OpenSSL)
+      // SPDX-License-Identifier: GPL-2.0 OR MIT
+      // SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
+      // SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
+      // SPDX-License-Identifier: GPL-2.0 OR MPL-1.1
+      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT
+      // SPDX-License-Identifier: GPL-1.0+ OR BSD-3-Clause OR OpenSSL
 
    AND should be used if the file has multiple licenses whose terms all
    apply to use the file. For example, if code is inherited from another
    project and permission has been given to put it in the kernel, but the
    original license terms need to remain in effect::
 
-      // SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) AND MIT)
+      // SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) AND MIT
 
    Another other example where both sets of license terms need to be
    adhered to is::
 
-      // SPDX-License-Identifier: (GPL-1.0+ AND LGPL-2.1+)
+      // SPDX-License-Identifier: GPL-1.0+ AND LGPL-2.1+
 
 License identifiers
 -------------------



^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2018-06-15 16:55 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-28 15:27 [patch V5 00/11] LICENSES: Add documentation and initial License files Thomas Gleixner
2017-12-28 15:27 ` [patch V5 01/11] Documentation: Add license-rules.rst to describe how to properly identify file licenses Thomas Gleixner
2017-12-28 22:17   ` Thomas Gleixner
2017-12-29 13:21     ` Philippe Ombredanne
2017-12-29 16:19       ` Joe Perches
2017-12-29 18:54         ` Theodore Ts'o
2017-12-29 22:17           ` Philippe Ombredanne
2017-12-30  4:15             ` Theodore Ts'o
2018-01-02  2:35               ` Andreas Dilger
2017-12-30 11:02           ` Thomas Gleixner
2018-06-12 19:03     ` Yang Li
2018-06-12 19:27       ` Thomas Gleixner
2018-06-15 16:55         ` Yang Li
2018-01-02 20:24   ` Darrick J. Wong
2017-12-28 15:27 ` [patch V5 02/11] LICENSES: Add the GPL 2.0 license Thomas Gleixner
2017-12-29 13:24   ` Philippe Ombredanne
2018-01-04 16:25   ` Carmen Bianca Bakker
2018-01-04 20:50     ` Philippe Ombredanne
2017-12-28 15:27 ` [patch V5 03/11] LICENSES: Add the LGPL " Thomas Gleixner
2017-12-28 15:27 ` [patch V5 04/11] LICENSES: Add the LGPL-2.1 license Thomas Gleixner
2017-12-28 15:27 ` [patch V5 05/11] LICENSES: Add the BSD 2-clause "Simplified" license Thomas Gleixner
2017-12-28 15:27 ` [patch V5 06/11] LICENSES: Add the BSD 3-clause "New" or "Revised" License Thomas Gleixner
2017-12-28 15:27 ` [patch V5 07/11] LICENSES: Add the BSD-3-clause "Clear" license Thomas Gleixner
2017-12-28 15:27 ` [patch V5 08/11] LICENSES: Add the MIT license Thomas Gleixner
2017-12-28 15:27 ` [patch V5 09/11] LICENSES: Add Linux syscall note exception Thomas Gleixner
2017-12-28 15:27 ` [patch V5 10/11] LICENSES: Add the GPL 1.0 license Thomas Gleixner
2017-12-28 15:27 ` [patch V5 11/11] LICENSES: Add MPL-1.1 license Thomas Gleixner
2017-12-29 13:42 ` [patch V5 00/11] LICENSES: Add documentation and initial License files Philippe Ombredanne

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).