Synchronise with v4.7

[kconfig-frontends] / scripts / ksync.log

diff --git a/scripts/ksync.log b/scripts/ksync.log
index 6505918bd8020fe03500e5f574d918ac4c2e95df..6e02beb126b8bb1cea82fc7153f518fe45173389 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -160,3 +160,7 @@ be596aa Add current selection check.
 aab24a8 kconfig: return 'false' instead of 'no' in bool function
 5b61c7b kconfig: fix qconf segfault by deleting heap objects
 6b87b70 unbreak allmodconfig KCONFIG_ALLCONFIG=...
+a466391 kconfig: add unexpected data itself to warning
+3e2ba95 kconfig-language: fix comment on dependency-generated menu structures.
+032a318 kconfig-language: elaborate on the type of a choice
+fa64e5f kconfig/symbol.c: handle choice_values that depend on 'm' symbols