linux-kernel - [PATCH] checkpatch: Tolerate upstream commit references

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20241217133430.342797-1-petrm@nvidia.com>
Date: Tue, 17 Dec 2024 14:34:30 +0100
From: Petr Machata <petrm@...dia.com>
To: Andy Whitcroft <apw@...onical.com>, Joe Perches <joe@...ches.com>
CC: Dwaipayan Ray <dwaipayanray1@...il.com>, Lukas Bulwahn
	<lukas.bulwahn@...il.com>, <linux-kernel@...r.kernel.org>, Andy Roulin
	<aroulin@...dia.com>, Petr Machata <petrm@...dia.com>
Subject: [PATCH] checkpatch: Tolerate upstream commit references

Two forms of upstream commit references are used (and documented) for
stable kernels:

- [ Upstream commit <sha1> ]
- commit <sha1> upstream.

These are useful apart from stable kernel trees to other downstream
maintainers that wish to keep track of what came from where. But
checkpatch gives citations on patches annotated this way.

Extend checkpatch to tolerate the documented upstream references. This
reduces noise for downstream maintainers.

Signed-off-by: Petr Machata <petrm@...dia.com>
Reviewed-by: Andy Roulin <aroulin@...dia.com>
---
 scripts/checkpatch.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9eed3683ad76..a6c81b38e413 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3340,6 +3340,8 @@ sub process {
 		if ($perl_version_ok &&
 		    $in_commit_log && !$commit_log_possible_stack_dump &&
 		    $line !~ /^\s*(?:Link|Patchwork|http|https|BugLink|base-commit):/i &&
+		    $line !~ /^\s*\[ Upstream commit [0-9a-f]{40} ]/ &&
+		    $line !~ /^\s*commit [0-9a-f]{40}\s*upstream\./ &&
 		    $line !~ /^This reverts commit [0-9a-f]{7,40}/ &&
 		    (($line =~ /\bcommit\s+[0-9a-f]{5,}\b/i ||
 		      ($line =~ /\bcommit\s*$/i && defined($rawlines[$linenr]) && $rawlines[$linenr] =~ /^\s*[0-9a-f]{5,}\b/i)) ||
-- 
2.47.0