Commit f9569c6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cb4eb677 ebf1bafd

Documentation/process/license-rules.rst

+5 −2
Original line number Diff line number Diff line
@@ -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.



|

scripts/checkpatch.pl

+8 −0
Original line number Diff line number Diff line
@@ -3866,6 +3866,14 @@ sub process { 
			     "Misplaced SPDX-License-Identifier tag - use line $checklicenseline instead\n" . $herecurr);

		}



# check for disallowed SPDX file tags

		if ($rawline =~ /\bSPDX-.*:/ &&

		    $rawline !~ /\bSPDX-License-Identifier:/ &&

		    $rawline !~ /\bSPDX-FileCopyrightText:/) {

			WARN("SPDX_LICENSE_TAG",

			     "Disallowed SPDX tag\n" . $herecurr);

		}



# line length limit (with some exclusions)

#

# There are a few types of lines that may extend beyond $max_line_length: