Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Gleixner and committed by
Jonathan Corbet
9376ff9b e37274fa

+7 -1
+1 -1
LICENSES/exceptions/Linux-syscall-note
··· 1 1 SPDX-Exception-Identifier: Linux-syscall-note 2 2 SPDX-URL: https://spdx.org/licenses/Linux-syscall-note.html 3 - SPDX-Licenses: GPL-2.0, GPL-2.0+, GPL-1.0+, LGPL-2.0, LGPL-2.0+, LGPL-2.1, LGPL-2.1+ 3 + SPDX-Licenses: GPL-2.0, GPL-2.0+, GPL-1.0+, LGPL-2.0, LGPL-2.0+, LGPL-2.1, LGPL-2.1+, GPL-2.0-only, GPL-2.0-or-later 4 4 Usage-Guide: 5 5 This exception is used together with one of the above SPDX-Licenses 6 6 to mark user space API (uapi) header files so they can be included
+6
LICENSES/preferred/GPL-2.0
··· 1 1 Valid-License-Identifier: GPL-2.0 2 + Valid-License-Identifier: GPL-2.0-only 2 3 Valid-License-Identifier: GPL-2.0+ 4 + Valid-License-Identifier: GPL-2.0-or-later 3 5 SPDX-URL: https://spdx.org/licenses/GPL-2.0.html 4 6 Usage-Guide: 5 7 To use this license in source code, put one of the following SPDX ··· 9 7 guidelines in the licensing rules documentation. 10 8 For 'GNU General Public License (GPL) version 2 only' use: 11 9 SPDX-License-Identifier: GPL-2.0 10 + or 11 + SPDX-License-Identifier: GPL-2.0-only 12 12 For 'GNU General Public License (GPL) version 2 or any later version' use: 13 13 SPDX-License-Identifier: GPL-2.0+ 14 + or 15 + SPDX-License-Identifier: GPL-2.0-or-later 14 16 License-Text: 15 17 16 18 GNU GENERAL PUBLIC LICENSE