public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>,
	Kate Stewart <kstewart@linuxfoundation.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jonathan Corbet <corbet@lwn.net>,
	Hans Verkuil <hans.verkuil@cisco.com>,
	Mauro Carvalho Chehab <mchehab@s-opensource.com>
Subject: [patch 4/9] LICENSES/GPL2.0: Add GPL-2.0-only/or-later as valid identifiers
Date: Mon, 23 Apr 2018 00:02:12 +0200	[thread overview]
Message-ID: <20180422220833.078058446@linutronix.de> (raw)
In-Reply-To: 20180422220208.772527041@linutronix.de

[-- Attachment #1: LICENSES-GPL2.0--Add-GPL-2.0-only-as-valid-identifier.patch --]
[-- Type: text/plain, Size: 1401 bytes --]

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 make everything consistent again.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
 LICENSES/preferred/GPL-2.0 |    6 ++++++
 1 file changed, 6 insertions(+)

--- 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 @@ SPDX-URL: https://spdx.org/licenses/GPL-
   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

  parent reply	other threads:[~2018-04-22 22:02 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-22 22:02 [patch 0/9] LICENSES: Add missing License Text and fixup bogus identifiers Thomas Gleixner
2018-04-22 22:02 ` [patch 1/9] x86/jailhouse: Fix incorrect SPDX identifier Thomas Gleixner
2018-04-23  6:52   ` Jan Kiszka
2018-04-23  8:22   ` [tip:x86/urgent] " tip-bot for Thomas Gleixner
2018-04-22 22:02 ` [patch 2/9] pinctrl: sh-pfc: r8a77965: Fixup " Thomas Gleixner
2018-04-23  9:17   ` Geert Uytterhoeven
2018-04-22 22:02 ` [patch 3/9] ARM: S3C24XX: Fix invalid " Thomas Gleixner
2018-04-23 15:26   ` Krzysztof Kozlowski
2018-04-24 13:27   ` Christoph Hellwig
2018-04-22 22:02 ` Thomas Gleixner [this message]
2018-04-23  6:52   ` [patch 4/9] LICENSES/GPL2.0: Add GPL-2.0-only/or-later as valid identifiers Greg Kroah-Hartman
2018-04-23  7:19     ` Hans Verkuil
2018-04-23 10:14     ` Mauro Carvalho Chehab
2018-04-24  8:01       ` Thomas Gleixner
2018-04-23 18:24   ` Kate Stewart
2018-04-22 22:02 ` [patch 5/9] LICENSES: Add X11 license Thomas Gleixner
2018-04-23  6:50   ` Greg Kroah-Hartman
2018-04-22 22:02 ` [patch 6/9] LICENSES: Add CDDL-1.0 license text Thomas Gleixner
2018-04-23  6:51   ` Greg Kroah-Hartman
2018-04-22 22:02 ` [patch 7/9] LICENSES: Add Apache 2.0 " Thomas Gleixner
2018-04-23  6:51   ` Greg Kroah-Hartman
2018-04-22 22:02 ` [patch 8/9] LICENSES: Add CC-BY-SA-4.0 " Thomas Gleixner
2018-04-23  6:54   ` Greg Kroah-Hartman
2018-04-23  7:37     ` Thomas Gleixner
2018-04-23  8:26       ` Greg Kroah-Hartman
2018-04-23 10:21         ` Mauro Carvalho Chehab
2018-04-23 12:29         ` Jonathan Corbet
2018-04-22 22:02 ` [patch 9/9] LICENSES: Add Linux-OpenIB " Thomas Gleixner
2018-04-23  6:55   ` Greg Kroah-Hartman
2018-04-23  6:57 ` [patch 0/9] LICENSES: Add missing License Text and fixup bogus identifiers Greg Kroah-Hartman
2018-04-23  7:34   ` Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180422220833.078058446@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=corbet@lwn.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=hans.verkuil@cisco.com \
    --cc=kstewart@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@s-opensource.com \
    --cc=pombredanne@nexb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox