From: Andrew Morton <akpm@linux-foundation.org>
To: Jonathan Corbet <corbet@lwn.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
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, 6 Jan 2025 18:20:04 -0800 [thread overview]
Message-ID: <20250106182004.284b2049753a886039015074@linux-foundation.org> (raw)
In-Reply-To: <87o70kt232.fsf@trenco.lwn.net>
On Mon, 06 Jan 2025 08:05:21 -0700 Jonathan Corbet <corbet@lwn.net> wrote:
> > --- 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...?
Sure, I added this:
--- a/scripts/checkpatch.pl~checkpatch-check-return-of-git_commit_info-fix
+++ a/scripts/checkpatch.pl
@@ -3240,7 +3240,7 @@ sub process {
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: '$fixed'\n" . $herecurr) &&
$fix) {
$fixed[$fixlinenr] = $fixed;
}
_
next prev parent reply other threads:[~2025-01-07 2:20 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
2025-01-07 2:20 ` Andrew Morton [this message]
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=20250106182004.284b2049753a886039015074@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=corbet@lwn.net \
--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