summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorStafford Horne <shorne@gmail.com>2017-10-03 16:16:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-03 17:54:26 -0700
commita08ffbef4ab799351d0610bbdbeaa1ee746b9065 (patch)
tree9e44b6485e10356272250fe95c42917c3ab2ac11 /scripts
parentd22e3d69ee1a3f83ff7cc943af63de48b6156dcf (diff)
downloadlinux-stable-a08ffbef4ab799351d0610bbdbeaa1ee746b9065.tar.gz
linux-stable-a08ffbef4ab799351d0610bbdbeaa1ee746b9065.tar.bz2
linux-stable-a08ffbef4ab799351d0610bbdbeaa1ee746b9065.zip
checkpatch: fix ignoring cover-letter logic
Currently running checkpatch on a directory with a cover-letter.patch file reports the following error: ----------------------------------------- patches/smp-v2/v2-0000-cover-letter.patch ----------------------------------------- ERROR: Does not appear to be a unified-diff format patch The logic to suppress the unified-diff check for cover letters is there but is checking $file instead of $filename. Fix the variable to use the correct one. Link: http://lkml.kernel.org/r/20170909090406.31523-1-shorne@gmail.com Signed-off-by: Stafford Horne <shorne@gmail.com> Acked-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/checkpatch.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index dd2c262aebbf..8b80bac055e4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -6390,7 +6390,7 @@ sub process {
exit(0);
}
- if (!$is_patch && $file !~ /cover-letter\.patch$/) {
+ if (!$is_patch && $filename !~ /cover-letter\.patch$/) {
ERROR("NOT_UNIFIED_DIFF",
"Does not appear to be a unified-diff format patch\n");
}