From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Jan 2012 22:35:34 +0000 (-0800)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Url: http://git.alex.org.uk

Merge branch 'kconfig' of git://git./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
---

287b901dcadd7eb3c5aa93b679bbad4058814921
diff --cc scripts/kconfig/Makefile
index 914833d,4dba0b8..7966265
--- a/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