diff options
| author | Zhiqiang Tu <ztu@codeaurora.org> | 2017-06-12 15:39:30 +0800 |
|---|---|---|
| committer | Zhiqiang Tu <ztu@codeaurora.org> | 2017-06-12 15:40:13 +0800 |
| commit | d992f38d6dad08d7566d252b9bc8577c67331f44 (patch) | |
| tree | a76ca1e7ad903b1442cca0a2170bfc891a2984bb /scripts/checkpatch.pl | |
| parent | 5beccaf9302888780a40e529c8c835a0b3eacaef (diff) | |
| parent | c1a2472056c800ff46e0ac21a4b67c179a570ad0 (diff) | |
Merge remote-tracking branch 'remotes/quic/msm-4.4' into dev/msm-4.4-8996au
Conflicts:
arch/arm64/configs/msm-auto-perf_defconfig
Change-Id: Ibc59804762c3e14031c22b03a52d49ff2acc36d4
Signed-off-by: Zhiqiang Tu <ztu@codeaurora.org>
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 1dcd4ed37103..c72bcb33496a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2500,6 +2500,7 @@ sub process { # Check for git id commit length and improperly formed commit descriptions if ($in_commit_log && !$commit_log_possible_stack_dump && + $line !~ /^This reverts commit [0-9a-f]{7,40}/ && ($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i || ($line =~ /\b[0-9a-f]{12,40}\b/i && $line !~ /[\<\[][0-9a-f]{12,40}[\>\]]/i && |