-----BEGIN PGP SIGNATURE-----

iQEcBAABAgAGBQJZ1kDRAAoJEJykq7OBq3PIVAQIALBBDDCIeYrQ0vin9JtwjKKv
 QjQmga16e5LLRj/94vwPTrPZJ5T9EapVnCSsif+DWb5+I+G8X52mLp4u9534jVAD
 xlfagcssPV85VyYti0uur9DLHS1lO6gpYD1KphDJ6uk2bVavyMmgB3ZhU0QkC2jZ
 HOc13oyOaGBLV5J6L1Vza9bnGV6LnNCo6ANzvc5ljPZ6jCYR2/s/v4wFeRYfGlU1
 JzqLO4YfpItDovMBXzeQy2aQpqMn2EbKar+pu4mKke9U4I/MnfYupql/089p1FlL
 NRyvGZZEgxuaDUIueoAI0dEo1xVtAIVFvThUoEzSXA2028+SNVSqhj8ytJm0yOE=
 =J+Rb
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-10-05 16:54:29 +01:00
commit d8f932cc69

View File

@ -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" .