Mark Brown 46dff8d7e3 scripts: merge_config: Add option to suppress warning on overrides ... Currently merge_config.sh will unconditionally warn if a fragment overrides any already set symbol. This is generally desirable but is inconvenient in cases where we want to create a fragment which disables unwanted options in the base configuration, for example when attempting to produce a smaller version of another configuration. Add an option -Q which will suppress these warnings. Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20230203-arm64-defconfigs-v1-1-cd0694a05f13@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2023-02-13 20:18:27 +01:00
..
lxdialog	kconfig: lxdialog: A spello fix and a punctuation added	2021-04-14 15:22:49 +09:00
tests	kconfig: change "modules" from sub-option to first-level attribute	2021-04-14 15:22:49 +09:00
.gitignore	kconfig: refactor Makefile to reduce process forks	2022-12-13 22:29:10 +09:00
conf.c	Kconfig: remove sym_set_choice_value	2022-09-29 04:40:15 +09:00
confdata.c	Kbuild: add Rust support	2022-09-28 09:02:20 +02:00
expr.c	kconfig: distinguish between dependencies and visibility in help text	2020-01-07 02:18:45 +09:00
expr.h	kconfig: remove allnoconfig_y option	2021-04-14 15:22:49 +09:00
gconf-cfg.sh	kconfig: refactor Makefile to reduce process forks	2022-12-13 22:29:10 +09:00
gconf.c	kconfig: highlight gconfig 'comment' lines with '***'	2021-04-19 14:57:16 +09:00
gconf.glade	scripts/kconfig/gconf.glade Update broken web addresses.	2010-09-17 16:54:42 +02:00
images.c	kconfig: constify XPM data	2020-08-14 13:30:03 +09:00
images.h	kconfig: constify XPM data	2020-08-14 13:30:03 +09:00
internal.h	kconfig: split menu.c out of parser.y	2021-04-14 15:26:09 +09:00
lexer.l	kconfig: rename a variable in the lexer to a clearer name	2021-09-30 02:08:59 +09:00
list.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
lkc_proto.h	kconfig: move sym_escape_string_value() to confdata.c	2021-10-11 23:13:23 +09:00
lkc.h	kconfig: remove const qualifier from str_get()	2022-11-21 10:18:39 +09:00
Makefile	kconfig: refactor Makefile to reduce process forks	2022-12-13 22:29:10 +09:00
mconf-cfg.sh	kconfig: refactor Makefile to reduce process forks	2022-12-13 22:29:10 +09:00
mconf.c	kconfig: Add static text for search information in help menu	2022-12-29 12:00:07 +09:00
menu.c	kconfig: remove unneeded variable in get_prompt_str()	2022-11-21 10:18:39 +09:00
merge_config.sh	scripts: merge_config: Add option to suppress warning on overrides	2023-02-13 20:18:27 +01:00
nconf-cfg.sh	kconfig: refactor Makefile to reduce process forks	2022-12-13 22:29:10 +09:00
nconf.c	scripts: kconfig: nconf: make nconfig accept jk keybindings	2022-06-05 06:20:57 +09:00
nconf.gui.c	kconfig: nconf: refactor in print_in_middle()	2021-04-14 15:25:43 +09:00
nconf.h	kconfig: nconf: refactor in print_in_middle()	2021-04-14 15:25:43 +09:00
parser.y	kconfig: split menu.c out of parser.y	2021-04-14 15:26:09 +09:00
preprocess.c	kconfig: let 'shell' return enough output for deep path names	2022-02-08 13:20:11 +09:00
qconf-cfg.sh	kconfig: refactor Makefile to reduce process forks	2022-12-13 22:29:10 +09:00
qconf.cc	kconfig: highlight xconfig 'comment' lines with '***'	2021-04-19 14:58:23 +09:00
qconf.h	kconfig: qconf: remove Y, M, N columns	2020-09-25 00:37:13 +09:00
streamline_config.pl	streamline_config.pl: show the full Kconfig name	2021-12-02 17:02:36 +09:00
symbol.c	kconfig: move sym_escape_string_value() to confdata.c	2021-10-11 23:13:23 +09:00
util.c	kconfig: remove const qualifier from str_get()	2022-11-21 10:18:39 +09:00