The patch titled checkpatch: suspect code indent must stop at #else/#elif has been removed from the -mm tree. Its filename was checkpatch-suspect-code-indent-must-stop-at-else-elif.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: checkpatch: suspect code indent must stop at #else/#elif From: Andy Whitcroft <apw@xxxxxxxxxxxx> When we hit and #else or #elif we know we are meeting an alternative piece of code. All bets are off on indent if we did not see the open of the control so stop checking. Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff -puN scripts/checkpatch.pl~checkpatch-suspect-code-indent-must-stop-at-else-elif scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-suspect-code-indent-must-stop-at-else-elif +++ a/scripts/checkpatch.pl @@ -1468,6 +1468,12 @@ sub process { while ($cond_ptr != $cond_lines) { $cond_ptr = $cond_lines; + # If we see an #else/#elif then the code + # is not linear. + if ($s =~ /^\s*\#\s*(?:else|elif)/) { + $check = 0; + } + # Ignore: # 1) blank lines, they should be at 0, # 2) preprocessor lines, and _ Patches currently in -mm which might be from apw@xxxxxxxxxxxx are origin.patch mm-hugetlbc-make-functions-static-use-null-rather-than-0.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