[PATCH] checkpatch: Tolerate upstream commit references

[PATCH] checkpatch: Tolerate upstream commit references

[Petr Machata]

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@nvidia.com>
Reviewed-by: Andy Roulin <aroulin@nvidia.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

Re: [PATCH] checkpatch: Tolerate upstream commit references

[Petr Machata]

Petr Machata <petrm@nvidia.com> writes:

> 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@nvidia.com>
> Reviewed-by: Andy Roulin <aroulin@nvidia.com>

Hello y'all all and happy 2025!

I sent this towards the end of the year, and understandably people were
busy around New Year's. This is to try and make sure the patch doesn't
get lost in last year's mailing, and ask for a bit of an attention from
maintainers.

Thanks!

> ---
>  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)) ||