summaryrefslogtreecommitdiff
path: root/LICENSES/preferred
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2018-04-25 23:30:21 +0300
committerJonathan Corbet <corbet@lwn.net>2018-04-28 01:38:59 +0300
commit9376ff9ba298c983062a12cbbafde506a4eaea71 (patch)
tree5c0f4564e0794fa68010f066176b24570b3fce28 /LICENSES/preferred
parente37274fa3a2b9b96926b471bf681554ac56d5749 (diff)
downloadlinux-9376ff9ba298c983062a12cbbafde506a4eaea71.tar.xz
LICENSES/GPL2.0: Add GPL-2.0-only/or-later as valid identifiers
Quite some files have been flagged with the new GPL-2.0-only and GPL-2.0-or-later identifiers which replace the original GPL-2.0 and GPL-2.0+ identifiers in the SPDX license identifier specification, but the identifiers are not mentioned as valid in the GPL-2.0 license file. Add them to the license file and to the Linux-syscall-note exception to make everything consistent again. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Cc: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'LICENSES/preferred')
-rw-r--r--LICENSES/preferred/GPL-2.06
1 files changed, 6 insertions, 0 deletions
diff --git a/LICENSES/preferred/GPL-2.0 b/LICENSES/preferred/GPL-2.0
index b8db91d3a1cb..ff0812fd89cc 100644
--- a/LICENSES/preferred/GPL-2.0
+++ b/LICENSES/preferred/GPL-2.0
@@ -1,5 +1,7 @@
Valid-License-Identifier: GPL-2.0
+Valid-License-Identifier: GPL-2.0-only
Valid-License-Identifier: GPL-2.0+
+Valid-License-Identifier: GPL-2.0-or-later
SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
Usage-Guide:
To use this license in source code, put one of the following SPDX
@@ -7,8 +9,12 @@ Usage-Guide:
guidelines in the licensing rules documentation.
For 'GNU General Public License (GPL) version 2 only' use:
SPDX-License-Identifier: GPL-2.0
+ or
+ SPDX-License-Identifier: GPL-2.0-only
For 'GNU General Public License (GPL) version 2 or any later version' use:
SPDX-License-Identifier: GPL-2.0+
+ or
+ SPDX-License-Identifier: GPL-2.0-or-later
License-Text:
GNU GENERAL PUBLIC LICENSE