Merge tag 'spdx-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx

81ff0be4 · Linus Torvalds <[email protected]> · 2022-01-12 11:33:50 -08:00

Pull SPDX/License update from Greg KH:
 "Here is a single change that fixes up the description of the 'LGPL-2.1
  or later' identifiers so that the tools properly acknowledge that this
  is a valid license.

  This change has been in linux-next for weeks with no reported problems"

* tag 'spdx-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx:
  LICENSES/LGPL-2.1: Add LGPL-2.1-or-later as valid identifiers

Commit: 81ff0be4b9e3bcfee022d71cf89d72f7e2ed41ba
Parents: 57ea8197 · bc128349

Merge commit. Changes below are compared with the first parent: 57ea8197.

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
LICENSES/preferred/LGPL-2.1	modified	+2	−0	View file

LICENSES/preferred/LGPL-2.1

View file

diff --git a/LICENSES/preferred/LGPL-2.1 b/LICENSES/preferred/LGPL-2.1
index 27bb434..b73f9b6 100644
--- a/LICENSES/preferred/LGPL-2.1
+++ b/LICENSES/preferred/LGPL-2.1
@@ -1,5 +1,7 @@
 Valid-License-Identifier: LGPL-2.1
+Valid-License-Identifier: LGPL-2.1-only
 Valid-License-Identifier: LGPL-2.1+
+Valid-License-Identifier: LGPL-2.1-or-later
 SPDX-URL: https://spdx.org/licenses/LGPL-2.1.html
 Usage-Guide:
   To use this license in source code, put one of the following SPDX