From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 16:27:52 +0000 (-0800)
Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v2.6.38-rc1~440
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=0c05384a5a1af2352b8c244cf32f480ba6cbf024;hp=-c

Merge branch 'kbuild' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  mkuboot.sh: Fail if mkimage is missing
  gen_init_cpio: checkpatch fixes
  gen_init_cpio: Avoid race between call to stat() and call to open()
  modpost: Fix address calculation in reloc_location()
  Make fixdep error handling more explicit
  checksyscalls: Fix stand-alone usage
  modpost: Put .zdebug* section on white list
  kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
  kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
  kbuild: introduce HDR_ARCH_LIST for headers_install_all
  headers_install: check exit status of unifdef
  gen_init_cpio: remove leading `/' from file names
  scripts/genksyms: fix header usage
  fixdep: use hash table instead of a single array
---

0c05384a5a1af2352b8c244cf32f480ba6cbf024
diff --combined Makefile
index 74b25559f831,ee77a3d88e0a..6a457690d10b
--- a/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 37
 -EXTRAVERSION = -rc1
 +EXTRAVERSION =
  NAME = Flesh-Eating Bats with Fangs
  
  # *DOCUMENTATION*
@@@ -224,6 -224,7 +224,7 @@@ ifeq ($(ARCH),m68knommu
  endif
  
  KCONFIG_CONFIG	?= .config
+ export KCONFIG_CONFIG
  
  # SHELL used by kbuild
  CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
diff --combined include/linux/Kbuild
index a354c199ab98,ae31f9521a6d..d1580c17cab3
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -20,15 -20,18 +20,18 @@@ header-y += wimax
  objhdr-y += version.h
  
  ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
- 		  $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
+ 		  $(srctree)/include/asm-$(SRCARCH)/a.out.h \
+ 		  $(INSTALL_HDR_PATH)/include/asm-*/a.out.h),)
  header-y += a.out.h
  endif
  ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
- 		  $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
+ 		  $(srctree)/include/asm-$(SRCARCH)/kvm.h \
+ 		  $(INSTALL_HDR_PATH)/include/asm-*/kvm.h),)
  header-y += kvm.h
  endif
  ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
- 		  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
+ 		  $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
+ 		  $(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
  header-y += kvm_para.h
  endif
  
@@@ -367,6 -370,7 +370,6 @@@ header-y += utime.
  header-y += utsname.h
  header-y += veth.h
  header-y += vhost.h
 -header-y += videodev.h
  header-y += videodev2.h
  header-y += virtio_9p.h
  header-y += virtio_balloon.h