Skip to contentSkip to conversation

checkpatch-fix-ignoring-cover-letter-logic.patch removed from -mm tree

merged [email protected] 1 participant 1 message Oct 4, 2017

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: checkpatch: fix ignoring cover-letter logic
has been removed from the -mm tree. Its filename was
checkpatch-fix-ignoring-cover-letter-logic.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Stafford Horne <[email protected]>
Subject: 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.

---

 scripts/checkpatch.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/checkpatch.pl renamed from scripts/checkpatch.pl~checkpatch-fix-ignoring-cover-letter-logic +1 -1
diff -puN scripts/checkpatch.pl~checkpatch-fix-ignoring-cover-letter-logic 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");
 	}

_

Patches currently in -mm which might be from [email protected] are