diff --git a/[refs] b/[refs] index 25e306207816..9f81340b0322 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: daebc534ac15f991961a5bb433e515988220e9bf +refs/heads/master: b9df76ac76da351cd4f6ba52369e9a64e9ab686d diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 061c28e7bcfa..95ba30a24dcf 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -2911,6 +2911,7 @@ sub process { $dstat !~ /^(?:$Ident|-?$Constant),$/ && # 10, // foo(), $dstat !~ /^(?:$Ident|-?$Constant);$/ && # foo(); $dstat !~ /^(?:$Ident|-?$Constant)$/ && # 10 // foo() + $dstat !~ /^'X'$/ && # character constants $dstat !~ /$exceptions/ && $dstat !~ /^\.$Ident\s*=/ && # .foo = $dstat !~ /^do\s*$Constant\s*while\s*$Constant;?$/ && # do {...} while (...); // do {...} while (...)