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

* master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild: (46 commits)
  kbuild: remove obsoleted scripts/reference_* files
  kbuild: fix make help & make *pkg
  kconfig: fix time ordering of writes to .kconfig.d and include/linux/autoconf.h
  Kconfig: remove the CONFIG_CC_ALIGN_* options
  kbuild: add -fverbose-asm to i386 Makefile
  kbuild: clean-up genksyms
  kbuild: Lindent genksyms.c
  kbuild: fix genksyms build error
  kbuild: in makefile.txt note that Makefile is preferred name for kbuild files
  kbuild: replace PHONY with FORCE
  kbuild: Fix bug in crc symbol generating of kernel and modules
  kbuild: change kbuild to not rely on incorrect GNU make behavior
  kbuild: when warning symbols exported twice now tell user this is the problem
  kbuild: fix make dir/file.xx when asm symlink is missing
  kbuild: in the section mismatch check try harder to find symbols
  kbuild: fix section mismatch check for unwind on IA64
  kbuild: kill false positives from section mismatch warnings for powerpc
  kbuild: kill trailing whitespace in modpost & friends
  kbuild: small update of allnoconfig description
  kbuild: make namespace.pl CROSS_COMPILE happy
  ...

Trivial conflict in arch/ppc/boot/Makefile manually fixed up

diff --cc Documentation/DocBook/Makefile
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/i386/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/m32r/Makefile
Simple merge

diff --cc arch/powerpc/Makefile
index a3fc7a23158fadac51e13609e5c3c232e02d5ed8,5787d55a20b61d3b94178e29de56c2afb1768d05..829e017b8a54c54b619094434f87846462c9868c
--- 1/arch/powerpc/Makefile
--- 2/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@@ -148,9 -148,9 +148,9 @@@ all: $(KBUILD_IMAGE
  
  CPPFLAGS_vmlinux.lds  := -Upowerpc
  
 -BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage
 +BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm uImage vmlinux.bin
  
- .PHONY: $(BOOT_TARGETS)
+ PHONY += $(BOOT_TARGETS)
  
  boot := arch/$(ARCH)/boot
  

diff --cc init/Kconfig
Simple merge

diff --cc scripts/Makefile.modpost
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge

diff --cc scripts/mod/modpost.c
index b8b2a560b26bdec79376abe7785c14abbbba8ffd,30f3ac8eb43c0c16a7d86a358d04ac62e31dc989..0b92ddff26fd146674834d5ff019d28413b97c1b
--- 1/scripts/mod/modpost.c
--- 2/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@@ -505,18 -920,22 +920,17 @@@ void __attribute__((format(printf, 2, 3
        char tmp[SZ];
        int len;
        va_list ap;
-       
+ 
        va_start(ap, fmt);
        len = vsnprintf(tmp, SZ, fmt, ap);
 -      if (buf->size - buf->pos < len + 1) {
 -              buf->size += 128;
 -              buf->p = realloc(buf->p, buf->size);
 -      }
 -      strncpy(buf->p + buf->pos, tmp, len + 1);
 -      buf->pos += len;
 +      buf_write(buf, tmp, len);
        va_end(ap);
  }
  
- void
- buf_write(struct buffer *buf, const char *s, int len)
+ void buf_write(struct buffer *buf, const char *s, int len)
  {
        if (buf->size - buf->pos < len) {
 -              buf->size += len;
 +              buf->size += len + SZ;
                buf->p = realloc(buf->p, buf->size);
        }
        strncpy(buf->p + buf->pos, s, len);