---

yaml
---
r: 15903
b: refs/heads/master
c: 752625c
h: refs/heads/master
i:
  15901: 1208faa
  15899: 9710658
  15895: a04e557
  15887: 5fec7bd
  15871: 96b0974
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54e08a2392e99ba9e48ce1060e0b52a39118419c
+refs/heads/master: 752625cff3eba81cbc886988d5b420064c033948

trunk/Makefile

@@ -477,18 +477,20 @@ ifeq ($(dot-config),1)
 
 # Read in dependencies to all Kconfig* files, make sure to run
 # oldconfig if changes are detected.
--include .config.cmd
+-include .kconfig.d
 
 include .config
 
 # If .config needs to be updated, it will be done via the dependency
 # that autoconf has on .config.
 # To avoid any implicit rule to kick in, define an empty command
-.config: ;
+.config .kconfig.d: ;
 
 # If .config is newer than include/linux/autoconf.h, someone tinkered
-# with it and forgot to run make oldconfig
-include/linux/autoconf.h: .config
+# with it and forgot to run make oldconfig.
+# If kconfig.d is missing then we are probarly in a cleaned tree so
+# we execute the config step to be sure to catch updated Kconfig files
+include/linux/autoconf.h: .kconfig.d .config
 	$(Q)mkdir -p include/linux
 	$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
 else

trunk/scripts/kconfig/util.c

@@ -33,7 +33,7 @@ int file_write_dep(const char *name)
 	FILE *out;
 
 	if (!name)
-		name = ".config.cmd";
+		name = ".kconfig.d";
 	out = fopen("..config.tmp", "w");
 	if (!out)
 		return 1;