The patch titled Subject: checkpatch: Allow comments in macros tested for single statements has been added to the -mm tree. Its filename is checkpatch-allow-comments-in-macros-tested-for-single-statements.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/checkpatch-allow-comments-in-macros-tested-for-single-statements.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/checkpatch-allow-comments-in-macros-tested-for-single-statements.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: Allow comments in macros tested for single statements Convert all the comments to spaces before testing for single statement macros. Reported-by: Valdis Kletnieks <Valdis.Kletnieks@xxxxxx> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff -puN scripts/checkpatch.pl~checkpatch-allow-comments-in-macros-tested-for-single-statements scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-allow-comments-in-macros-tested-for-single-statements +++ a/scripts/checkpatch.pl @@ -4260,6 +4260,7 @@ sub process { $ctx = $dstat; $dstat =~ s/\\\n.//g; + $dstat =~ s/$;/ /g; if ($dstat =~ /^\+\s*#\s*define\s+$Ident\s*${balanced_parens}\s*do\s*{(.*)\s*}\s*while\s*\(\s*0\s*\)\s*([;\s]*)\s*$/) { my $stmts = $2; _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are printk-correct-timeout-comment-neaten-module_parm_desc.patch mm-utilc-add-kstrimdup.patch checkpatch-emit-an-error-when-using-predefined-timestamp-macros.patch checkpatch-improve-octal-permissions-tests.patch checkpatch-ignore-__pure-attribute.patch checkpatch-fix-unnecessary_kern_level-false-positive.patch checkpatch-add-check-for-keyword-boolean-in-kconfig-definitions.patch checkpatch-allow-comments-in-macros-tested-for-single-statements.patch fs-ufs-superc-remove-unnecessary-casting.patch linux-next.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