diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-04 23:34:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-04 23:34:52 +0300 |
| commit | 41bef91c8aa351255cd19e7e72608ee86f7f4bab (patch) | |
| tree | fdfa9ded44d6dda872a8549469c9c0055cef6d68 /scripts | |
| parent | f162626a038ec06da98ac38ce3d6bdbd715e9c5f (diff) | |
| parent | 163e0c27fead96fd6804fa59a55fc4f841d38db8 (diff) | |
| download | linux-41bef91c8aa351255cd19e7e72608ee86f7f4bab.tar.xz | |
Merge tag 'kbuild-fixes-v5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- fix documents
- fix warning in 'make localmodconfig'
* tag 'kbuild-fixes-v5.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kconfig: remove redundant assignment prompt = prompt
kbuild: Documentation: clean up makefiles.rst
kconfig: streamline_config.pl: check defined(ENV variable) before using it
Documentation/llvm: Improve formatting of commands, variables, and arguments
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/nconf.c | 1 | ||||
| -rwxr-xr-x | scripts/kconfig/streamline_config.pl | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index daf1c1506ec4..e0f965529166 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -755,7 +755,6 @@ static void build_conf(struct menu *menu) switch (ptype) { case P_MENU: child_count++; - prompt = prompt; if (single_menu_mode) { item_make(menu, 'm', "%s%*c%s", diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl index 19857d18d814..1c78ba49ca99 100755 --- a/scripts/kconfig/streamline_config.pl +++ b/scripts/kconfig/streamline_config.pl @@ -593,7 +593,10 @@ while ($repeat) { } my %setconfigs; -my @preserved_kconfigs = split(/:/,$ENV{LMC_KEEP}); +my @preserved_kconfigs; +if (defined($ENV{'LMC_KEEP'})) { + @preserved_kconfigs = split(/:/,$ENV{LMC_KEEP}); +} sub in_preserved_kconfigs { my $kconfig = $config2kfile{$_[0]}; |