From: Sam Ravnborg Date: Fri, 6 Aug 2010 05:13:54 +0000 (+0200) Subject: kconfig: fix make oldconfig X-Git-Tag: MMI-PSA29.97-13-9~23058 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=14828349719aa09845843477df8bad60792d18f3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git kconfig: fix make oldconfig Linus wrote: This seems to make "make oldconfig" a _lot_ more verbose than it used to be. In a very annoying way. I just did a quick git bisect. It's introduced by commit 4062f1a4c030 ("kconfig: use long options in conf") by Sam Ravnborg. Apparently that thing is totally buggy, and doesn't just change the option names, but actively breaks them. The old behaviour (from years ago) were reintroduced by accident. Fix this so we are back to the version that are silent if there is nothing to ask about. Reported-by: Linus Torvalds Signed-off-by: Sam Ravnborg Reviewed-by: Michal Marek Signed-off-by: Linus Torvalds --- diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index 010600ef58c0..274f2716b03e 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -599,12 +599,12 @@ int main(int ac, char **av) break; case savedefconfig: break; - case oldconfig: case oldaskconfig: rootEntry = &rootmenu; conf(&rootmenu); input_mode = silentoldconfig; /* fall through */ + case oldconfig: case listnewconfig: case oldnoconfig: case silentoldconfig: