Synchronise with v4.6

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

diff --git a/.version b/.version
index 70d457ee582999868ecc246463b460edbe20c711..e50d722a5d0f975a8f77812ee0dffe976ef7bb93 100644 (file)
--- a/.version
+++ b/.version
@@ -1,2 +1,2 @@
-4.5.0 b562e44f507e863c6792946e4e1b1449fbbac85d Blurry Fish Butt
+4.6.0 2dcd0af568b0cf583645c8a317dd12e344b1c72a Charred Weasel
 0

diff --git a/libs/parser/confdata.c b/libs/parser/confdata.c
index 0b7dc2fd7bac0e2985a0b16c023b98cca23325e7..dd243d2abd875b535d006535232821eefad3460b 100644 (file)
--- a/libs/parser/confdata.c
+++ b/libs/parser/confdata.c
@@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def)
                if (in)
                        goto load;
                sym_add_change_count(1);
-               if (!sym_defconfig_list) {
-                       sym_calc_value(modules_sym);
+               if (!sym_defconfig_list)
                        return 1;
-               }
 
                for_all_defaults(sym_defconfig_list, prop) {
                        if (expr_calc_value(prop->visible.expr) == no ||
@@ -403,7 +401,6 @@ setsym:
        }
        free(line);
        fclose(in);
-       sym_calc_value(modules_sym);
        return 0;
 }
 
@@ -414,8 +411,12 @@ int conf_read(const char *name)
 
        sym_set_change_count(0);
 
-       if (conf_read_simple(name, S_DEF_USER))
+       if (conf_read_simple(name, S_DEF_USER)) {
+               sym_calc_value(modules_sym);
                return 1;
+       }
+
+       sym_calc_value(modules_sym);
 
        for_all_symbols(i, sym) {
                sym_calc_value(sym);
@@ -846,6 +847,7 @@ static int conf_split_config(void)
 
        name = conf_get_autoconfig_name();
        conf_read_simple(name, S_DEF_AUTO);
+       sym_calc_value(modules_sym);
 
        if (chdir("include/config"))
                return 1;

diff --git a/scripts/ksync.log b/scripts/ksync.log
index 27b5a7834430d765eb91fe7988a7078df22467e6..6505918bd8020fe03500e5f574d918ac4c2e95df 100644 (file)
--- a/scripts/ksync.log
+++ b/scripts/ksync.log
@@ -159,3 +159,4 @@ be596aa Add current selection check.
 74dba80 kconfig: allow kconfig to handle longer path names
 aab24a8 kconfig: return 'false' instead of 'no' in bool function
 5b61c7b kconfig: fix qconf segfault by deleting heap objects
+6b87b70 unbreak allmodconfig KCONFIG_ALLCONFIG=...