The patch titled Subject: checkpatch: kconfig: replace '---help---' with 'help' has been removed from the -mm tree. Its filename was checkpatch-kconfig-replace-help-with-help.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Nicolai Fischer <nicolai.fischer@xxxxxx> Subject: checkpatch: kconfig: replace '---help---' with 'help' Patch series "update kconfig parsing", v3. This series updates the parsing of Kconfig files within checkpatch.pl to the current state. This patch (of 5): All '---help---' lines have been replaced by just 'help'. Therefore it is no longer necessary to include '---' in the regex. Link: https://lkml.kernel.org/r/20210103075015.23946-1-nicolai.fischer@xxxxxx Link: https://lkml.kernel.org/r/20210103075015.23946-2-nicolai.fischer@xxxxxx Co-developed-by: Johannes Czekay <johannes.czekay@xxxxxx> Signed-off-by: Johannes Czekay <johannes.czekay@xxxxxx> Signed-off-by: Nicolai Fischer <nicolai.fischer@xxxxxx> Acked-by: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/scripts/checkpatch.pl~checkpatch-kconfig-replace-help-with-help +++ a/scripts/checkpatch.pl @@ -3323,7 +3323,7 @@ sub process { if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) { $is_start = 1; - } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) { + } elsif ($lines[$ln - 1] =~ /^\+\s*help$/) { $length = -1; } _ Patches currently in -mm which might be from nicolai.fischer@xxxxxx are checkpatch-kconfig-add-missing-types-to-regex.patch checkpatch-kconfig-enforce-help-text-indentation.patch checkpatch-kconfig-clarify-warning-for-paragraph-length.patch checkpatch-kconfig-enforce-block-indentation.patch