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 /tools/perf/trace/beauty/flock.c | |
| parent | Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (diff) | |
| parent | kconfig/symbol.c: handle choice_values that depend on 'm' symbols (diff) | |
| download | linux-dev-f429d35588847fa1048f9dbdcc3cc1ee1b530041.tar.xz linux-dev-f429d35588847fa1048f9dbdcc3cc1ee1b530041.zip | |
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 'tools/perf/trace/beauty/flock.c')
0 files changed, 0 insertions, 0 deletions