tree bc37076381ebc9b003e4244f0630939861c8167c
parent dab3c3cc4f44273ccf2d7ff57c0a4f5bd45c0528
parent 78a6854e219ba266b6cc12f840b571c5f1168b5e
author Linus Torvalds <torvalds@linux-foundation.org> 1441747058 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441747058 -0700

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig updates from Michal Marek:
 - kconfig warns about junk characters in Kconfig files
 - merge_config.sh error handling
 - small cleanup

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  merge_config.sh: exit on missing input files
  kconfig: Regenerate shipped zconf.{hash,lex}.c files
  kconfig: warn of unhandled characters in Kconfig commands
  kconfig: Delete unnecessary checks before the function call "sym_calc_value"