From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 23 Aug 2021 23:59:59 +0000 (+1000)
Subject: checkpatch-improve-git_commit_id-test-fix
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b81f67c562dcaf7bbb6aa3a07e9dc6558f6432bd;p=users%2Fjedix%2Flinux-maple.git

checkpatch-improve-git_commit_id-test-fix

add missing &&

Cc: Denis Efremov <efremov@linux.com>
Cc: Dwaipayan Ray <dwaipayanray1@gmail.com>
Cc: Joe Perches <joe@perches.com>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 7c33ffafa3f0..c27d2312cfc3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3181,7 +3181,7 @@ sub process {
 # possible SHA-1 matches.
 # A commit match can span multiple lines so this block attempts to find a
 # complete typical commit on a maximum of 3 lines
-		if ($perl_version_ok
+		if ($perl_version_ok &&
 		    $in_commit_log && !$commit_log_possible_stack_dump &&
 		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink|base-commit):/i &&
 		    $line !~ /^This reverts commit [0-9a-f]{7,40}/ &&