From b16baed494d3c3fb66eeaaf9d8c1dbc7c6c0479f Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Wed, 9 Dec 2020 21:55:38 +1300
Subject: kconfig: Sync with upstream v4.20

6bbe4385d035 kconfig: merge_config: avoid false positive matches from comment lines
2cd3faf87d2d merge_config.sh: Allow to define config prefix
0085b4191f3e kconfig: remove silentoldconfig target
04c459d20448 kconfig: remove oldnoconfig target

Signed-off-by: Chris Packham <judge.packham@gmail.com>

diff --git a/kconfig/conf.c b/kconfig/conf.c
index a0db354..5a795c5 100644
--- a/kconfig/conf.c
+++ b/kconfig/conf.c
@@ -460,12 +460,6 @@ static struct option long_opts[] = {
 	{"randconfig",      no_argument,       NULL, randconfig},
 	{"listnewconfig",   no_argument,       NULL, listnewconfig},
 	{"olddefconfig",    no_argument,       NULL, olddefconfig},
-	/*
-	 * oldnoconfig is an alias of olddefconfig, because people already
-	 * are dependent on its behavior(sets new symbols to their default
-	 * value but not 'n') with the counter-intuitive name.
-	 */
-	{"oldnoconfig",     no_argument,       NULL, olddefconfig},
 	{NULL, 0, NULL, 0}
 };
 
-- 
cgit v0.10.2-6-g49f6