From: Greg Kroah-Hartman Date: Mon, 20 Apr 2026 13:28:48 +0000 (+0200) Subject: drop a patch X-Git-Tag: v6.12.83~34 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d29d7766cdc28b243307d039c0ae03f73417dba8;p=thirdparty%2Fkernel%2Fstable-queue.git drop a patch --- diff --git a/queue-5.15/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-5.15/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index 7738b65aa9..0000000000 --- a/queue-5.15/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -588,6 +588,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -665,7 +666,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3000,6 +3001,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-5.15/series b/queue-5.15/series index 58d4f32452..ff818e3199 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -68,7 +68,6 @@ usb-gadget-renesas_usb3-validate-endpoint-index-in-standard-request-handlers.pat usbip-validate-number_of_packets-in-usbip_pack_ret_submit.patch usb-storage-expand-range-of-matched-versions-for-vl817-quirks-entry.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch staging-sm750fb-fix-division-by-zero-in-ps_to_hz.patch usb-serial-option-add-telit-cinterion-fn990a-mbim-composition.patch alsa-ctxfi-limit-ptp-to-a-single-page.patch diff --git a/queue-6.1/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-6.1/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index 8fb0693f22..0000000000 --- a/queue-6.1/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -616,6 +616,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -693,7 +694,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3031,6 +3032,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-6.1/series b/queue-6.1/series index 7f3cdf1a28..ce28636cff 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -77,7 +77,6 @@ usb-storage-expand-range-of-matched-versions-for-vl817-quirks-entry.patch usb-cdc-acm-add-quirks-for-yoga-book-9-14iah10-ingenic-touchscreen.patch usb-port-add-delay-after-usb_hub_set_port_power.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch scripts-generate_rust_analyzer.py-avoid-fd-leak.patch staging-sm750fb-fix-division-by-zero-in-ps_to_hz.patch usb-serial-option-add-telit-cinterion-fn990a-mbim-composition.patch diff --git a/queue-6.12/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-6.12/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index 0c0cefa31c..0000000000 --- a/queue-6.12/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -622,6 +622,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -715,7 +716,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3070,6 +3071,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-6.12/series b/queue-6.12/series index 840f709a0c..ba1cf722a0 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -114,7 +114,6 @@ usb-cdc-acm-add-quirks-for-yoga-book-9-14iah10-ingenic-touchscreen.patch usb-gadget-f_hid-don-t-call-cdev_init-while-cdev-in-use.patch usb-port-add-delay-after-usb_hub_set_port_power.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch scripts-generate_rust_analyzer.py-avoid-fd-leak.patch wifi-rtw88-fix-device-leak-on-probe-failure.patch staging-sm750fb-fix-division-by-zero-in-ps_to_hz.patch diff --git a/queue-6.18/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-6.18/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index 889d10efc6..0000000000 --- a/queue-6.18/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -641,6 +641,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -737,7 +738,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3087,6 +3088,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-6.18/series b/queue-6.18/series index 2d601a6586..e8611f3845 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -148,7 +148,6 @@ usb-cdc-acm-add-quirks-for-yoga-book-9-14iah10-ingenic-touchscreen.patch usb-gadget-f_hid-don-t-call-cdev_init-while-cdev-in-use.patch usb-port-add-delay-after-usb_hub_set_port_power.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch scripts-generate_rust_analyzer.py-avoid-fd-leak.patch wifi-rtw88-fix-device-leak-on-probe-failure.patch staging-sm750fb-fix-division-by-zero-in-ps_to_hz.patch diff --git a/queue-6.19/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-6.19/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index bb8cc94541..0000000000 --- a/queue-6.19/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -641,6 +641,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -737,7 +738,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3091,6 +3092,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-6.19/series b/queue-6.19/series index d3078fd4bc..a55a034738 100644 --- a/queue-6.19/series +++ b/queue-6.19/series @@ -167,7 +167,6 @@ usb-cdc-acm-add-quirks-for-yoga-book-9-14iah10-ingenic-touchscreen.patch usb-gadget-f_hid-don-t-call-cdev_init-while-cdev-in-use.patch usb-port-add-delay-after-usb_hub_set_port_power.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch scripts-gdb-symbols-handle-module-path-parameters.patch scripts-generate_rust_analyzer.py-avoid-fd-leak.patch wifi-rtw88-fix-device-leak-on-probe-failure.patch diff --git a/queue-6.6/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-6.6/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index 8a0583de8f..0000000000 --- a/queue-6.6/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -621,6 +621,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -714,7 +715,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3069,6 +3070,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-6.6/series b/queue-6.6/series index 830a97313f..a063f7414a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -89,7 +89,6 @@ usb-storage-expand-range-of-matched-versions-for-vl817-quirks-entry.patch usb-cdc-acm-add-quirks-for-yoga-book-9-14iah10-ingenic-touchscreen.patch usb-port-add-delay-after-usb_hub_set_port_power.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch scripts-generate_rust_analyzer.py-avoid-fd-leak.patch wifi-rtw88-fix-device-leak-on-probe-failure.patch staging-sm750fb-fix-division-by-zero-in-ps_to_hz.patch diff --git a/queue-7.0/scripts-checkpatch-add-assisted-by-tag-validation.patch b/queue-7.0/scripts-checkpatch-add-assisted-by-tag-validation.patch deleted file mode 100644 index a4cb85795e..0000000000 --- a/queue-7.0/scripts-checkpatch-add-assisted-by-tag-validation.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf Mon Sep 17 00:00:00 2001 -From: Harry Wentland -Date: Fri, 27 Mar 2026 11:41:57 -0400 -Subject: scripts/checkpatch: add Assisted-by: tag validation - -From: Harry Wentland - -commit 8545d9bc4bd0801e0bdfbfdfdc2532ff31236ddf upstream. - -The coding-assistants.rst documentation defines the Assisted-by: tag -format for AI-assisted contributions as: - - Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] - -This format does not use an email address, so checkpatch currently -reports a false positive about an invalid email when encountering this -tag. - -Add Assisted-by: to the recognized signature tags and standard signature -list. When an Assisted-by: tag is found, validate it instead of checking -for an email address. - -Examples of passing tags: -- Claude:claude-3-opus coccinelle sparse -- FOO:BAR.baz -- Copilot Github:claude-3-opus -- GitHub Copilot:Claude Opus 4.6 -- My Cool Agent:v1.2.3 coccinelle sparse - -Examples of tags triggering the new warning: -- Claude coccinelle sparse -- JustAName -- :missing-agent - -Cc: Jani Nikula -Assisted-by: Claude:claude-opus-4.6 -Co-developed-by: Alex Hung -Signed-off-by: Alex Hung -Signed-off-by: Harry Wentland -Cc: stable@vger.kernel.org -Signed-off-by: Jonathan Corbet -Message-ID: <20260327154157.162962-1-harry.wentland@amd.com> -Signed-off-by: Greg Kroah-Hartman ---- - scripts/checkpatch.pl | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/scripts/checkpatch.pl -+++ b/scripts/checkpatch.pl -@@ -641,6 +641,7 @@ our $signature_tags = qr{(?xi: - Reviewed-by:| - Reported-by:| - Suggested-by:| -+ Assisted-by:| - To:| - Cc: - )}; -@@ -737,7 +738,7 @@ sub find_standard_signature { - my ($sign_off) = @_; - my @standard_signature_tags = ( - 'Signed-off-by:', 'Co-developed-by:', 'Acked-by:', 'Tested-by:', -- 'Reviewed-by:', 'Reported-by:', 'Suggested-by:' -+ 'Reviewed-by:', 'Reported-by:', 'Suggested-by:', 'Assisted-by:' - ); - foreach my $signature (@standard_signature_tags) { - return $signature if (get_edit_distance($sign_off, $signature) <= 2); -@@ -3105,6 +3106,15 @@ sub process { - } - } - -+# Assisted-by: uses format AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2] instead of email -+ if ($sign_off =~ /^assisted-by:$/i) { -+ if ($email !~ /^[^:]+:\S+(\s+\S+)*$/) { -+ WARN("BAD_ASSISTED_BY", -+ "Assisted-by: should use format: 'Assisted-by: AGENT_NAME:MODEL_VERSION [TOOL1] [TOOL2]'\n" . $herecurr); -+ } -+ next; -+ } -+ - my ($email_name, $name_comment, $email_address, $comment) = parse_email($email); - my $suggested_email = format_email(($email_name, $name_comment, $email_address, $comment)); - if ($suggested_email eq "") { diff --git a/queue-7.0/series b/queue-7.0/series index 541383cb0d..e4b04cf623 100644 --- a/queue-7.0/series +++ b/queue-7.0/series @@ -29,7 +29,6 @@ usb-cdc-acm-add-quirks-for-yoga-book-9-14iah10-ingenic-touchscreen.patch usb-gadget-f_hid-don-t-call-cdev_init-while-cdev-in-use.patch usb-port-add-delay-after-usb_hub_set_port_power.patch fbdev-udlfb-avoid-divide-by-zero-on-fbioput_vscreeninfo.patch -scripts-checkpatch-add-assisted-by-tag-validation.patch scripts-gdb-symbols-handle-module-path-parameters.patch scripts-generate_rust_analyzer.py-avoid-fd-leak.patch wifi-rtw88-fix-device-leak-on-probe-failure.patch