Synchronise with 4.9

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/.version b/.version
index d058ade8e7633f2493d124668944eec2508916d0..d7296b37a182f0e226aacbc484089835d6c4210e 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-4.8.0 c8d2bc9bc39ebea8437fd974fdbc21847bb897a3 Psychotic Stoned Sheep
+4.9.0 69973b830859bc6529a7a0468ba0d80ee5117826 Roaring Lionus
 0

diff --git a/docs/kconfig-language.txt b/docs/kconfig-language.txt
index db101857b2c98c8e1f306620be41287b41f43a25..069fcb3eef6ed21f714715fb7cddf024b98470e0 100644 (file)
--- a/docs/kconfig-language.txt
+++ b/docs/kconfig-language.txt
@@ -274,7 +274,44 @@ menuconfig:
 
 This is similar to the simple config entry above, but it also gives a
 hint to front ends, that all suboptions should be displayed as a
-separate list of options.
+separate list of options. To make sure all the suboptions will really
+show up under the menuconfig entry and not outside of it, every item
+from the <config options> list must depend on the menuconfig symbol.
+In practice, this is achieved by using one of the next two constructs:
+
+(1):
+menuconfig M
+if M
+    config C1
+    config C2
+endif
+
+(2):
+menuconfig M
+config C1
+    depends on M
+config C2
+    depends on M
+
+In the following examples (3) and (4), C1 and C2 still have the M
+dependency, but will not appear under menuconfig M anymore, because
+of C0, which doesn't depend on M:
+
+(3):
+menuconfig M
+    config C0
+if M
+    config C1
+    config C2
+endif
+
+(4):
+menuconfig M
+config C0
+config C1
+    depends on M
+config C2
+    depends on M
 
 choices:
 

diff --git a/scripts/ksync.log b/scripts/ksync.log
index 6e02beb126b8bb1cea82fc7153f518fe45173389..9c872b1c7b1d13c61d189c636d1ac6eb723feb7b 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -164,3 +164,4 @@ 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
+cfd7c612 kconfig-language: improve menuconfig usage description