diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 22:27:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 22:27:09 -0700 |
| commit | f429d35588847fa1048f9dbdcc3cc1ee1b530041 (patch) | |
| tree | 9c54202c7beb91fa3b76b4f18dc759c570ff1ef9 /scripts/kconfig/confdata.c | |
| parent | 5b26fc8824da15a2fe9df89338a5a3cad41ba8ee (diff) | |
| parent | fa64e5f6a35efd5e77d639125d973077ca506074 (diff) | |
| download | linux-f429d35588847fa1048f9dbdcc3cc1ee1b530041.tar.bz2 | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig update from Michal Marek:
- fix for behavior of tristate choice items and fix for documentation
of existing kconfig behavior [Dirk Gouders]
- more helpful "unexpected data" kconfig warning [Paul Bolle]
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kconfig/symbol.c: handle choice_values that depend on 'm' symbols
kconfig-language: elaborate on the type of a choice
kconfig-language: fix comment on dependency-generated menu structures.
kconfig: add unexpected data itself to warning
Diffstat (limited to 'scripts/kconfig/confdata.c')
| -rw-r--r-- | scripts/kconfig/confdata.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index dd243d2abd87..297b079ae4d9 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -375,7 +375,9 @@ load: continue; } else { if (line[0] != '\r' && line[0] != '\n') - conf_warning("unexpected data"); + conf_warning("unexpected data: %.*s", + (int)strcspn(line, "\r\n"), line); + continue; } setsym: |