From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Apr 2018 23:28:01 +0000 (-0700)
Subject: Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: v4.17-rc1~144
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=147a89bc71e7db40f011454a40add7ff2d10f8d8;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kconfig updates from Masahiro Yamada:

 - improve checkpatch for more precise Kconfig code checking

 - clarify effective selects by grouping reverse dependencies in help

 - do not write out '# CONFIG_FOO is not set' from invisible symbols

 - make oldconfig as silent as it should be

 - rename 'silentoldconfig' to 'syncconfig'

 - add unit-test framework and several test cases

 - warn unmet dependency of tristate symbols

 - make unmet dependency warnings readable, removing false positives

 - improve recursive include detection

 - use yylineno to simplify the line number tracking

 - misc cleanups

* tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (30 commits)
  kconfig: use yylineno option instead of manual lineno increments
  kconfig: detect recursive inclusion earlier
  kconfig: remove duplicated file name and lineno of recursive inclusion
  kconfig: do not include both curses.h and ncurses.h for nconfig
  kconfig: make unmet dependency warnings readable
  kconfig: warn unmet direct dependency of tristate symbols selected by y
  kconfig: tests: test if recursive inclusion is detected
  kconfig: tests: test if recursive dependencies are detected
  kconfig: tests: test randconfig for choice in choice
  kconfig: tests: test defconfig when two choices interact
  kconfig: tests: check visibility of tristate choice values in y choice
  kconfig: tests: check unneeded "is not set" with unmet dependency
  kconfig: tests: test if new symbols in choice are asked
  kconfig: tests: test automatic submenu creation
  kconfig: tests: add basic choice tests
  kconfig: tests: add framework for Kconfig unit testing
  kbuild: add PYTHON2 and PYTHON3 variables
  kconfig: remove redundant streamline_config.pl prerequisite
  kconfig: rename silentoldconfig to syncconfig
  kconfig: invoke oldconfig instead of silentoldconfig from local*config
  ...
---

147a89bc71e7db40f011454a40add7ff2d10f8d8
diff --cc scripts/kconfig/Makefile
index eb139a17383c,78c96aabd00f..f9bdd02c06a2
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -36,13 -36,15 +36,13 @@@ nconfig: $(obj)/ncon
  
  # This has become an internal implementation detail and is now deprecated
  # for external use.
- silentoldconfig: $(obj)/conf
+ syncconfig: $(obj)/conf
  	$(Q)mkdir -p include/config include/generated
 -	$(Q)test -e include/generated/autoksyms.h || \
 -	    touch   include/generated/autoksyms.h
  	$< $(silent) --$@ $(Kconfig)
  
- localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+ localyesconfig localmodconfig: $(obj)/conf
  	$(Q)mkdir -p include/config include/generated
- 	$(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
+ 	$(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
  	$(Q)if [ -f .config ]; then 					\
  			cmp -s .tmp.config .config ||			\
  			(mv -f .config .config.old.1;			\