Pull SPDX update from Greg KH: "Here is a single SPDX-like change for 7.1-rc1. It explicitly allows the use of SPDX-FileCopyrightText which has been used already in many files. At the same time, update checkpatch to catch any "non allowed" spdx identifiers as we don't want to go overboard here. This has been in linux-next for a long time with no reported problems" * tag 'spdx-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx: LICENSES: Explicitly allow SPDX-FileCopyrightText
Showing the changes to scripts (1 of 2 files). Show all
Unified · Split
| @@ -3866,6 +3866,14 @@ sub process { · 3865 unmodified lines | |||
| 3866 | "Misplaced SPDX-License-Identifier tag - use line $checklicenseline instead\n" . $herecurr); | 3866 | "Misplaced SPDX-License-Identifier tag - use line $checklicenseline instead\n" . $herecurr); |
| 3867 | } | 3867 | } |
| 3868 | 3868 | ||
| 3869 | # check for disallowed SPDX file tags | ||
| 3870 | if ($rawline =~ /\bSPDX-.*:/ && | ||
| 3871 | $rawline !~ /\bSPDX-License-Identifier:/ && | ||
| 3872 | $rawline !~ /\bSPDX-FileCopyrightText:/) { | ||
| 3873 | WARN("SPDX_LICENSE_TAG", | ||
| 3874 | "Disallowed SPDX tag\n" . $herecurr); | ||
| 3875 | } | ||
| 3876 | |||
| 3869 | # line length limit (with some exclusions) | 3877 | # line length limit (with some exclusions) |
| 3870 | # | 3878 | # |
| 3871 | # There are a few types of lines that may extend beyond $max_line_length: | 3879 | # There are a few types of lines that may extend beyond $max_line_length: |