diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-05 16:54:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-05 16:54:29 +0100 |
| commit | d8f932cc696250cb740240d668b39df5fbb2d5a0 (patch) | |
| tree | 57c2af203b1d867260f61d42cc754a8c8a479def | |
| parent | 67caeeacd3bbb4265901aae56ca5f47312534938 (diff) | |
| parent | 45042732f39ecd42794c256bf98f231e58849c3e (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Thu 05 Oct 2017 15:25:21 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
checkpatch: fix incompatibility with old perl
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | scripts/checkpatch.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3c0a28e644..0c41f1212f 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1432,7 +1432,8 @@ sub process { qr/%[-+ *.0-9]*([hljztL]|ll|hh)?(x|X|"\s*PRI[xX][^"]*"?)/; # don't consider groups splitted by [.:/ ], like 2A.20:12ab - my $tmpline = $rawline =~ s/($hex[.:\/ ])+$hex//gr; + my $tmpline = $rawline; + $tmpline =~ s/($hex[.:\/ ])+$hex//g; if ($tmpline =~ /(?<!0x)$hex/) { ERROR("Hex numbers must be prefixed with '0x'\n" . |