From: Jonathan Corbet <corbet@lwn.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Tamir Duberstein <tamird@gmail.com>
Subject: Re: linux-next: manual merge of the jc_docs tree with the mm tree
Date: Mon, 06 Jan 2025 08:05:21 -0700 [thread overview]
Message-ID: <87o70kt232.fsf@trenco.lwn.net> (raw)
In-Reply-To: <20250106095826.140c01cb@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> 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.
The fix looks fine, but...
> --
> 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) &&
...it all comes down to a single "+" sign here. If 253f01394dc0 could
be tweaked to add that character, I think this conflict would go away
and we wouldn't make Linus delve into Perl code...?
Just a thought.
Thanks,
jon
next prev parent reply other threads:[~2025-01-06 15:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-05 22:58 linux-next: manual merge of the jc_docs tree with the mm tree Stephen Rothwell
2025-01-06 15:05 ` Jonathan Corbet [this message]
2025-01-07 2:20 ` Andrew Morton
2025-01-22 23:37 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o70kt232.fsf@trenco.lwn.net \
--to=corbet@lwn.net \
--cc=akpm@linux-foundation.org \
--cc=geert+renesas@glider.be \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tamird@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox