The patch titled Subject: localmodconfig: fix parsing of "help" text has been added to the -mm tree. Its filename is localmodconfig-fix-parsing-of-help-text.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/localmodconfig-fix-parsing-of-help-text.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/localmodconfig-fix-parsing-of-help-text.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Benjamin Poirier <bpoirier@xxxxxxxx> Subject: localmodconfig: fix parsing of "help" text Help text may start with "help" or "---help---". This patch fixes read_kconfig() to recognize the second variant. This removes useless junk from %depends and %selects. That junk is due to help text that contains the words "selects" and "depends". Link: http://lkml.kernel.org/r/1460333193-16361-2-git-send-email-bpoirier@xxxxxxxx Signed-off-by: Benjamin Poirier <bpoirier@xxxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> Cc: Michal Marek <mmarek@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/kconfig/streamline_config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN scripts/kconfig/streamline_config.pl~localmodconfig-fix-parsing-of-help-text scripts/kconfig/streamline_config.pl --- a/scripts/kconfig/streamline_config.pl~localmodconfig-fix-parsing-of-help-text +++ a/scripts/kconfig/streamline_config.pl @@ -257,7 +257,7 @@ sub read_kconfig { $iflevel-- if ($iflevel); # stop on "help" and keywords that end a menu entry - } elsif (/^\s*help\s*$/ || /^(comment|choice|menu)\b/) { + } elsif (/^\s*(---)?help(---)?\s*$/ || /^(comment|choice|menu)\b/) { $state = "NONE"; } } _ Patches currently in -mm which might be from bpoirier@xxxxxxxx are localmodconfig-fix-parsing-of-kconfig-source-statements.patch localmodconfig-recognize-more-keywords-that-end-a-menu-entry.patch localmodconfig-fix-parsing-of-help-text.patch localmodconfig-add-missing-to-reference-a-variable.patch localmodconfig-reset-certificate-paths.patch localmodconfig-fix-whitespace-repeat-count-after-tristate.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html