Merge branch 'linus' into timers/urgent

Get upstream changes so we can apply fixes against them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 4 insertions, 2 deletions

diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index bde5b95c8c19..d19944f9c3ac 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -527,11 +527,12 @@ int main(int ac, char **av)
                         seed_env = getenv("KCONFIG_SEED");
                         if( seed_env && *seed_env ) {
                                 char *endp;
-                                int tmp = (int)strtol(seed_env, &endp, 10);
+                                int tmp = (int)strtol(seed_env, &endp, 0);
                                 if (*endp == '\0') {
                                         seed = tmp;
                                 }
                         }
+                        fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed );
                         srand(seed);
                         break;
                 }
@@ -653,7 +654,8 @@ int main(int ac, char **av)
                 conf_set_all_new_symbols(def_default);
                 break;
         case randconfig:
-                conf_set_all_new_symbols(def_random);
+                /* Really nothing to do in this loop */
+                while (conf_set_all_new_symbols(def_random)) ;
                 break;
         case defconfig:
                 conf_set_all_new_symbols(def_default);