* linux-next: manual merge of the jc_docs tree with the mm tree
@ 2025-01-05 22:58 Stephen Rothwell
2025-01-06 15:05 ` Jonathan Corbet
2025-01-22 23:37 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-01-05 22:58 UTC (permalink / raw)
To: Jonathan Corbet, Andrew Morton
Cc: Geert Uytterhoeven, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
[-- Attachment #1: Type: text/plain, Size: 1906 bytes --]
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.
--
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;
}
}
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the jc_docs tree with the mm tree
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
2025-01-22 23:37 ` Stephen Rothwell
1 sibling, 1 reply; 4+ messages in thread
From: Jonathan Corbet @ 2025-01-06 15:05 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton
Cc: Geert Uytterhoeven, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the jc_docs tree with the mm tree
2025-01-06 15:05 ` Jonathan Corbet
@ 2025-01-07 2:20 ` Andrew Morton
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2025-01-07 2:20 UTC (permalink / raw)
To: Jonathan Corbet
Cc: Stephen Rothwell, Geert Uytterhoeven, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
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;
}
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the jc_docs tree with the mm tree
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-22 23:37 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-01-22 23:37 UTC (permalink / raw)
To: Andrew Morton
Cc: Jonathan Corbet, Geert Uytterhoeven, Linux Kernel Mailing List,
Linux Next Mailing List, Tamir Duberstein
[-- Attachment #1: Type: text/plain, Size: 2195 bytes --]
Hi all,
On Mon, 6 Jan 2025 09:58:26 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-22 23:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2025-01-22 23:37 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox