Merge branch 'kbuild/kconfig' into kbuild/for-next

Conflicts:
	scripts/kconfig/Makefile

diff --cc Documentation/kbuild/kconfig.txt
Simple merge

diff --cc scripts/kconfig/Makefile
index 0a34335bf0f9f351dd35b23fe4c81a1b6587080b,c0e459e2b01473ff002bbe2b497b19c7184c288a..de934def410f0d2563a41105b8e02400b7f4cb44
--- 1/scripts/kconfig/Makefile
--- 2/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -31,44 -31,34 +31,44 @@@ oldconfig: $(obj)/con
  
  silentoldconfig: $(obj)/conf
        $(Q)mkdir -p include/generated
-       $< -s $(Kconfig)
+       $< --$@ $(Kconfig)
  
 +# if no path is given, then use src directory to find file
 +ifdef LSMOD
 +LSMOD_F := $(LSMOD)
 +ifeq ($(findstring /,$(LSMOD)),)
 +  LSMOD_F := $(objtree)/$(LSMOD)
 +endif
 +endif
 +
  localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 -      $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
 -      $(Q)if [ -f .config ]; then                                     \
 +      $(Q)mkdir -p include/generated
 +      $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-       $(Q)if [ -f .config ]; then                             \
-                       cmp -s .tmp.config .config ||           \
-                       (mv -f .config .config.old.1;           \
-                        mv -f .tmp.config .config;             \
-                        $(obj)/conf -s $(Kconfig);             \
-                        mv -f .config.old.1 .config.old)       \
-       else                                                    \
-                       mv -f .tmp.config .config;              \
-                       $(obj)/conf -s $(Kconfig);              \
++      $(Q)if [ -f .config ]; then                                     \
+                       cmp -s .tmp.config .config ||                   \
+                       (mv -f .config .config.old.1;                   \
+                        mv -f .tmp.config .config;                     \
+                        $(obj)/conf --silentoldconfig $(Kconfig);      \
+                        mv -f .config.old.1 .config.old)               \
+       else                                                            \
+                       mv -f .tmp.config .config;                      \
+                       $(obj)/conf --silentoldconfig $(Kconfig);       \
        fi
        $(Q)rm -f .tmp.config
  
  localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
 -      $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
 +      $(Q)mkdir -p include/generated
 +      $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
        $(Q)sed -i s/=m/=y/ .tmp.config
-       $(Q)if [ -f .config ]; then                             \
-                       cmp -s .tmp.config .config ||           \
-                       (mv -f .config .config.old.1;           \
-                        mv -f .tmp.config .config;             \
-                        $(obj)/conf -s $(Kconfig);             \
-                        mv -f .config.old.1 .config.old)       \
-       else                                                    \
-                       mv -f .tmp.config .config;              \
-                       $(obj)/conf -s $(Kconfig);              \
+       $(Q)if [ -f .config ]; then                                     \
+                       cmp -s .tmp.config .config ||                   \
+                       (mv -f .config .config.old.1;                   \
+                        mv -f .tmp.config .config;                     \
+                        $(obj)/conf --silentoldconfig $(Kconfig);      \
+                        mv -f .config.old.1 .config.old)               \
+       else                                                            \
+                       mv -f .tmp.config .config;                      \
+                       $(obj)/conf --silentoldconfig $(Kconfig);       \
        fi
        $(Q)rm -f .tmp.config