The patch titled Subject: checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files has been added to the -mm tree. Its filename is checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 checkpatch-fix-global_initialisers-test.patch ocfs2-reduce-object-size-of-mlog-uses.patch ocfs2-reduce-object-size-of-mlog-uses-fix.patch ocfs2-remove-__mlog_cpu_guess.patch ocfs2-remove-__mlog_cpu_guess-fix.patch ocfs2-neaten-do_error-ocfs2_error-and-ocfs2_abort.patch compiler-gcch-neatening.patch compiler-gcc-integrate-the-various-compiler-gcch-files.patch get_maintainerpl-add-get_maintainerignore-file-capability.patch mm-utilc-add-kstrimdup.patch checkpatch-check-for-uncommented-waitqueue_active.patch checkpatch-add-strict-warning-for-c99-fixed-size-typedefs-intsize_t.patch checkpatch-make-types-found-in-a-source-file-patch-local.patch checkpatch-use-string-consistently.patch checkpatch-categorize-some-long-line-length-checks.patch checkpatch-improve-output-with-multiple-command-line-files.patch checkpatch-colorize-output-to-terminal.patch checkpatch-add-showfile-to-allow-input-via-pipe-to-show-filenames.patch checkpatch-remove-local-from-codespell-path.patch checkpatch-avoid-not_unified_diff-errors-on-cover-letterpatch-files.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 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