Hi all,
On Mon, 6 Jan 2025 09:58:26 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> scripts/checkpatch.pl
>
> between commit:
>
> 253f01394dc0 ("checkpatch: check return of `git_commit_info`")
>
> from the mm-nonmm-unstable branch of the mm tree and commit:
>
> 6356f18f09dc ("Align git commit ID abbreviation guidelines and checks")
>
> from the jc_docs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc scripts/checkpatch.pl
> index 744328d21eb8,f7087dda9ac9..000000000000
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@@ -3237,12 -3237,12 +3237,12 @@@ sub process
> my ($cid, $ctitle) = git_commit_info($orig_commit, $id,
> $title);
>
> - if ($ctitle ne $title || $tag_case || $tag_space ||
> - $id_length || $id_case || !$title_has_quotes) {
> + if (defined($cid) && ($ctitle ne $title || $tag_case || $tag_space || $id_length || $id_case || !$title_has_quotes)) {
> + my $fixed = "Fixes: $cid (\"$ctitle\")";
> if (WARN("BAD_FIXES_TAG",
> - "Please use correct Fixes: style 'Fixes: <12 chars of sha1> (\"<title line>\")' - ie: '$fixed'\n" . $herecurr) &&
> - "Please use correct Fixes: style 'Fixes: <12+ chars of sha1> (\"<title line>\")' - ie: 'Fixes: $cid (\"$ctitle\")'\n" . $herecurr) &&
> ++ "Please use correct Fixes: style 'Fixes: <12+ chars of sha1> (\"<title line>\")' - ie: '$fixed'\n" . $herecurr) &&
> $fix) {
> - $fixed[$fixlinenr] = "Fixes: $cid (\"$ctitle\")";
> + $fixed[$fixlinenr] = $fixed;
> }
> }
> }
This is now a conflict between Linus' tree and the nn-nonmm-stable tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpzw768T9B7E.pgp
Description: OpenPGP digital signature
