Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: revert "save ARCH & CROSS_COMPILE ..."
  warn about use of uninstalled kernel headers
  kbuild: mkcompile_h: trivial cleanups
  kbuild: fix warning when domainname is not available
  kbuild: Fix size_append issue for bzip2/lzma kernel
  kbuild,scripts: use non-builtin echo for '-e'
  kbuild: fix the binrpm-pkg target to work with KBUILD_OUTPUT set

diff --combined Makefile
index 927d7a32ed9e068a0cef649235e3d7b6b073bc33,8e5aaeeb86b7cb8d60109c99d0138553da5a2b69..326791575b0af456119f7fbe2716a54453cc8e3a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
 -EXTRAVERSION = -rc3
 +EXTRAVERSION = -rc4
  NAME = Man-Eating Seals of Antiquity
  
  # *DOCUMENTATION*
@@@ -179,46 -179,9 +179,9 @@@ SUBARCH := $(shell uname -m | sed -e s/
  # Alternatively CROSS_COMPILE can be set in the environment.
  # Default value for CROSS_COMPILE is not to prefix executables
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
- #
- # To force ARCH and CROSS_COMPILE settings include kernel.* files
- # in the kernel tree - do not patch this file.
  export KBUILD_BUILDHOST := $(SUBARCH)
- 
- # Kbuild save the ARCH and CROSS_COMPILE setting in kernel.* files.
- # Restore these settings and check that user did not specify
- # conflicting values.
- 
- saved_arch  := $(shell cat include/generated/kernel.arch  2> /dev/null)
- saved_cross := $(shell cat include/generated/kernel.cross 2> /dev/null)
- 
- ifneq ($(CROSS_COMPILE),)
-         ifneq ($(saved_cross),)
-                 ifneq ($(CROSS_COMPILE),$(saved_cross))
-                         $(error CROSS_COMPILE changed from \
-                                 "$(saved_cross)" to \
-                                  to "$(CROSS_COMPILE)". \
-                                  Use "make mrproper" to fix it up)
-                 endif
-         endif
- else
-     CROSS_COMPILE := $(saved_cross)
- endif
- 
- ifneq ($(ARCH),)
-         ifneq ($(saved_arch),)
-                 ifneq ($(saved_arch),$(ARCH))
-                         $(error ARCH changed from \
-                                 "$(saved_arch)" to "$(ARCH)". \
-                                  Use "make mrproper" to fix it up)
-                 endif
-         endif
- else
-         ifneq ($(saved_arch),)
-                 ARCH := $(saved_arch)
-         else
-                 ARCH := $(SUBARCH)
-         endif
- endif
+ ARCH          ?= $(SUBARCH)
+ CROSS_COMPILE ?=
  
  # Architecture as present in compile.h
  UTS_MACHINE   := $(ARCH)
@@@ -483,11 -446,6 +446,6 @@@ ifeq ($(config-targets),1
  include $(srctree)/arch/$(SRCARCH)/Makefile
  export KBUILD_DEFCONFIG KBUILD_KCONFIG
  
- # save ARCH & CROSS_COMPILE settings
- $(shell mkdir -p include/generated &&                            \
-         echo $(ARCH)          > include/generated/kernel.arch && \
-         echo $(CROSS_COMPILE) > include/generated/kernel.cross)
- 
  config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux include/config
        $(Q)$(MAKE) $(build)=scripts/kconfig $@