diff --git a/[refs] b/[refs] index 72ad09f2b9c7..7c20ed08bdd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f16fa28f7b3d95e989fc64c8480e44c1bcf4bac3 +refs/heads/master: bf30d6ede099c2a31b13bbd05b1022dc0da684d5 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index c479bdefc779..54dfa2b543dd 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -2142,9 +2142,10 @@ sub process { $dstat =~ s/\s*$//s; # Flatten any parentheses and braces - while ($dstat =~ s/\([^\(\)]*\)/1/) { - } - while ($dstat =~ s/\{[^\{\}]*\}/1/) { + while ($dstat =~ s/\([^\(\)]*\)/1/ || + $dstat =~ s/\{[^\{\}]*\}/1/ || + $dstat =~ s/\[[^\{\}]*\]/1/) + { } my $exceptions = qr{