The patch titled Subject: checkpatch: fix up complex macros context format has been removed from the -mm tree. Its filename was checkpatch-correctly-track-the-end-of-preprocessor-commands-in-context-fix.patch This patch was dropped because it was folded into checkpatch-correctly-track-the-end-of-preprocessor-commands-in-context.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andy Whitcroft <apw@xxxxxxxxxxxxx> Subject: checkpatch: fix up complex macros context format Fix a missing newline and correctly use the raw context for the complex macro report. Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN scripts/checkpatch.pl~checkpatch-correctly-track-the-end-of-preprocessor-commands-in-context-fix scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-correctly-track-the-end-of-preprocessor-commands-in-context-fix +++ a/scripts/checkpatch.pl @@ -2851,7 +2851,7 @@ sub process { "Macros with multiple statements should be enclosed in a do - while loop\n" . "$herectx"); } else { ERROR("COMPLEX_MACRO", - "Macros with complex values should be enclosed in parenthesis\n" . "$here$ctx"); + "Macros with complex values should be enclosed in parenthesis\n" . "$herectx"); } } } _ Patches currently in -mm which might be from apw@xxxxxxxxxxxxx are checkpatch-correctly-track-the-end-of-preprocessor-commands-in-context.patch checkpatch-check-for-common-memset-parameter-issues-against-statments.patch checkpatch-improve-memset-and-min-max-with-cast-checking.patch checkpatch-improve-memset-and-min-max-with-cast-checking-fix.patch checkpatch-is-not-a-valid-modifier.patch checkpatch-optimise-statement-scanner-when-mid-statement.patch checkpatch-only-apply-kconfig-help-checks-for-options-which-prompt.patch checkpatch-fix-export_symbol-handling-following-a-function.patch checkpatch-complex-macro-should-allow-the-empty-do-while-loop.patch checkpatch-fix-return-is-not-a-function-square-bracket-handling.patch checkpatch-fix-complex-macros-handling-of-square-brackets.patch checkpatch-ensure-cast-type-is-unique-in-the-context-parser.patch checkpatch-typeof-may-have-more-complex-arguments.patch checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line.patch checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line-checkpatch-fixes.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