Commit 06330fc40e3f ("checkpatch: Avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files") added an exception to bypass the unified-diff check for cover letters. The patch evaluates the cover letter regex against $file. Instead it should use $filename.
This patch corrects the variable. Signed-off-by: Matthew R. Ochs <mro...@linux.vnet.ibm.com> --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index f2a1131..fdb1e48 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -5808,7 +5808,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"); } -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/