diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-11 15:54:30 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-11 15:54:30 +0100 |
| commit | ae8bd85ca8a4a812721388ab85b3d67077951f52 (patch) | |
| tree | b01af045e7352464aa5ede530dc772dc52e5907e /scripts/checkpatch.pl | |
| parent | 7b75cd5128421c673153efb1236705696a1a9812 (diff) | |
| parent | c9b69a0cf0b4336fe7d2e35c46273debc68910fd (diff) | |
| download | cachepc-linux-ae8bd85ca8a4a812721388ab85b3d67077951f52.tar.gz cachepc-linux-ae8bd85ca8a4a812721388ab85b3d67077951f52.zip | |
Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 60d4a79674b6..504d2e431c60 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2639,8 +2639,8 @@ sub process { # Check if the commit log has what seems like a diff which can confuse patch if ($in_commit_log && !$commit_log_has_diff && - (($line =~ m@^\s+diff\b.*a/[\w/]+@ && - $line =~ m@^\s+diff\b.*a/([\w/]+)\s+b/$1\b@) || + (($line =~ m@^\s+diff\b.*a/([\w/]+)@ && + $line =~ m@^\s+diff\b.*a/[\w/]+\s+b/$1\b@) || $line =~ m@^\s*(?:\-\-\-\s+a/|\+\+\+\s+b/)@ || $line =~ m/^\s*\@\@ \-\d+,\d+ \+\d+,\d+ \@\@/)) { ERROR("DIFF_IN_COMMIT_MSG", |