The patch titled Subject: checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files has been removed from the -mm tree. Its filename was checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Joe Perches <joe@xxxxxxxxxxx> Subject: checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files Make an exception for the "Does not appear to be a unified-diff" error when scanning what appears to be git generated cover letters. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Suggested-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN scripts/checkpatch.pl~checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files +++ a/scripts/checkpatch.pl @@ -5614,7 +5614,7 @@ sub process { exit(0); } - if (!$is_patch) { + if (!$is_patch && $file !~ /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 joe@xxxxxxxxxxx are origin.patch ocfs2-neaten-do_error-ocfs2_error-and-ocfs2_abort.patch mm-utilc-add-kstrimdup.patch linux-next.patch printk-improve-the-description-of-dev-kmsg-line-format.patch fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix.patch maintainers-update-sound-soc-intel-patterns.patch maintainers-update-brcm-dts-pattern.patch maintainers-update-brcm-gpio-filename-pattern.patch maintainers-remove-unused-nbdh-pattern.patch maintainers-move-jens-osterkamp-to-credits.patch maintainers-bcache-kent-overstreet-has-changed-email-address.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html