diff --git a/[refs] b/[refs] index 8ffba7e98b20..914ee6cbabcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea71a0a019f913bdf506103bd90140d93a2b83f0 +refs/heads/master: fb9e9096ba94385b738a8ad6c5864b5778285957 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 57df90699219..7fee82384ed4 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -182,7 +182,7 @@ sub help { }x; our $typeTypedefs = qr{(?x: - (?:__)?(?:u|s|be|le)(?:\d|\d\d)| + (?:__)?(?:u|s|be|le)(?:8|16|32|64)| atomic_t )}; @@ -1936,7 +1936,7 @@ sub process { # A unary '*' may be const } elsif ($ctx =~ /.xW/) { - ERROR("Aspace prohibited after that '$op' $at\n" . $hereptr); + ERROR("space prohibited after that '$op' $at\n" . $hereptr); } # unary ++ and unary -- are allowed no space on one side.