When running the license check, if we are updating a license it is possible for the checkpatch script to test against old license lines instead of newer ones, since the removal lines appear before the addition lines in a .patch file.
Fix this by skipping over lines that start with "-" in the checkpatch script. Signed-off-by: Nabih Estefan <[email protected]> --- scripts/checkpatch.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 833f20f555..c57a423f9f 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1813,7 +1813,8 @@ sub process { } # Check SPDX-License-Identifier references a permitted license - if ($rawline =~ m,SPDX-License-Identifier: (.*?)(\*/)?\s*$,) { + if (($rawline =~ m,SPDX-License-Identifier: (.*?)(\*/)?\s*$,) && + $rawline !~ /^-/) { $fileinfo->{facts}->{sawspdx} = 1; &checkspdx($realfile, $1); } -- 2.51.0.384.g4c02a37b29-goog
