Hi Linus, this is the kconfig pull request for v3.3-rc1: * compiler warning fixes * new merge_config.sh script that some distributions are using * menuconfig fix for the exit dialog and a fix for the fix Michal The following changes since commit 1ea6b8f48918282bdca0b32a34095504ee65bab5: Linux 3.2-rc1 (2011-11-07 16:16:02 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git kconfig Arnaud Lacombe (1): kbuild: Fix compiler warning with assertion when calling 'fwrite' Darren Hart (2): merge_config.sh: use signal names compatible with dash and bash merge_config.sh: whitespace cleanup John Stultz (2): kconfig: add merge_config.sh script merge_config.sh: fix bug in final check Li Zefan (1): menuconfig: fix a regression when canceling the prompt dialog at exit Peter Foley (4): kconfig: fix warnings by specifing format arguments kconfig: fix set but not used warnings kconfig: use xfwrite wrapper function to silence warnings Improve update-po-config output Wang YanQing (1): menuconfig: let make not report error when not save configuration scripts/kconfig/Makefile | 6 +- scripts/kconfig/confdata.c | 4 +- scripts/kconfig/expr.h | 1 + scripts/kconfig/gconf.c | 11 +-- scripts/kconfig/lkc.h | 6 +- scripts/kconfig/mconf.c | 2 + scripts/kconfig/merge_config.sh | 117 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 133 insertions(+), 14 deletions(-) create mode 100644 scripts/kconfig/merge_config.sh -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html