Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  menuconfig: fix a regression when canceling the prompt dialog at exit
  kbuild: Fix compiler warning with assertion when calling 'fwrite'
  Improve update-po-config output
  menuconfig: let make not report error when not save configuration
  merge_config.sh: fix bug in final check
  merge_config.sh: whitespace cleanup
  merge_config.sh: use signal names compatible with dash and bash
  kconfig: add merge_config.sh script
  kconfig: use xfwrite wrapper function to silence warnings
  kconfig: fix set but not used warnings
  kconfig: fix warnings by specifing format arguments

diff --cc scripts/kconfig/Makefile
index 914833d99b06f78242fa12584c568ecef6a5e65a,4dba0b8f1f02d111586bb01dae8f9aef76af7fce..79662658fb9158af1d7b3ee43dba0cfab0aa42cf
--- 1/scripts/kconfig/Makefile
--- 2/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -60,15 -59,17 +59,16 @@@ update-po-config: $(obj)/kxgettext $(ob
            --directory=$(srctree) --directory=$(objtree)           \
            --output $(obj)/config.pot
        $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
 -      $(Q)ln -fs Kconfig.x86 arch/um/Kconfig
 -      $(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
 +      $(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
 +          $(srctree)/arch/*/um/Kconfig`;               \
            do                                           \
-               echo "  GEN $$i";                        \
+               echo "  GEN     $$i";                    \
                $(obj)/kxgettext $$i                     \
                     >> $(obj)/config.pot;               \
            done )
+       $(Q)echo "  GEN     linux.pot"
        $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
            --output $(obj)/linux.pot
 -      $(Q)rm -f $(srctree)/arch/um/Kconfig
        $(Q)rm -f $(obj)/config.pot
  
  PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig