aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2018-03-23 05:51:05 -0400
committerJonathan Corbet <corbet@lwn.net>2018-03-23 14:41:35 -0400
commit88de995ccf48acaf4eced7ef485118b6bc65b880 (patch)
tree7cb0a7ed0cd4de52a6ef13f64b8a7c32eb4abc69
parentaebb47d4e7a9c5a4f456aa0b2e1f7d612d1c78ba (diff)
COPYING: create a new file with points to the Kernel license files
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 Chehab <mchehab@s-opensource.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--COPYING.new18
-rw-r--r--Documentation/process/license-rules.rst20
2 files changed, 29 insertions, 9 deletions
diff --git a/COPYING.new b/COPYING.new
new file mode 100644
index 000000000000..da4cb28febe6
--- /dev/null
+++ b/COPYING.new
@@ -0,0 +1,18 @@
1The Linux Kernel is provided under:
2
3 SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
4
5Being under the terms of the GNU General Public License version 2 only,
6according with:
7
8 LICENSES/preferred/GPL-2.0
9
10With an explicit syscall exception, as stated at:
11
12 LICENSES/exceptions/Linux-syscall-note
13
14In addition, other licenses may also apply. Please see:
15
16 Documentation/process/license-rules.rst
17
18for more details.
diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst
index 408f77dc6157..8ea26325fe3f 100644
--- a/Documentation/process/license-rules.rst
+++ b/Documentation/process/license-rules.rst
@@ -4,15 +4,17 @@ Linux kernel licensing rules
4============================ 4============================
5 5
6The Linux Kernel is provided under the terms of the GNU General Public 6The Linux Kernel is provided under the terms of the GNU General Public
7License version 2 only (GPL-2.0), as published by the Free Software 7License version 2 only (GPL-2.0), as provided in LICENSES/preferred/GPL-2.0,
8Foundation, and provided in the COPYING file. This documentation file is 8with an explicit syscall exception described in
9not meant to replace the COPYING file, but provides a description of how 9LICENSES/exceptions/Linux-syscall-note, as described in the COPYING file.
10each source file should be annotated to make the licensing it is governed 10
11under clear and unambiguous. 11This documentation file provides a description of how each source file
12 12should be annotated to make its license clear and unambiguous.
13The license in the COPYING file applies to the kernel source as a whole, 13It doesn't replace the Kernel's license.
14though individual source files can have a different license which is 14
15required to be compatible with the GPL-2.0:: 15The license described in the COPYING file applies to the kernel source
16as a whole, though individual source files can have a different license
17which is required to be compatible with the GPL-2.0::
16 18
17 GPL-1.0+ : GNU General Public License v1.0 or later 19 GPL-1.0+ : GNU General Public License v1.0 or later
18 GPL-2.0+ : GNU General Public License v2.0 or later 20 GPL-2.0+ : GNU General Public License v2.0 or later