From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 25 Mar 2006 16:48:48 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
X-Git-Tag: v2.6.17-rc1~733
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=2e1ca21d46aaef95101723fa402f39d3a95aba59

Merge /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
---

2e1ca21d46aaef95101723fa402f39d3a95aba59
diff --cc arch/powerpc/Makefile
index a3fc7a23158f,5787d55a20b6..829e017b8a54
--- a/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 scripts/mod/modpost.c
index b8b2a560b26b,30f3ac8eb43c..0b92ddff26fd
--- a/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);