diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-04-24 13:30:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-04-24 13:30:54 -0700 |
| commit | f9569c6ce4a4bbad0876ca7bd1e04fbfbbc1641f (patch) | |
| tree | c2b6752bb078de1593437400ae359ea1e4af2ab0 /Documentation | |
| parent | cb4eb6771c0f8fd1c52a8f6fdec7762fb087380a (diff) | |
| parent | ebf1bafd090790704ba54c032de299fccd90a9da (diff) | |
Merge tag 'spdx-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/process/license-rules.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/process/license-rules.rst b/Documentation/process/license-rules.rst index 59a7832df7d0..b0176bb8a465 100644 --- a/Documentation/process/license-rules.rst +++ b/Documentation/process/license-rules.rst @@ -63,8 +63,11 @@ License identifier syntax The SPDX license identifier in kernel files shall be added at the first possible line in a file which can contain a comment. For the majority of files this is the first line, except for scripts which require the - '#!PATH_TO_INTERPRETER' in the first line. For those scripts the SPDX - identifier goes into the second line. + '#!PATH_TO_INTERPRETER' in the first line. For those scripts, the SPDX + license identifier goes into the second line. + + The license identifier line can then be followed by one or multiple + SPDX-FileCopyrightText lines if desired. | |