From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 May 2011 20:31:37 +0000 (-0700)
Subject: Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v3.0-rc1~310
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=2bb732cdb48d271ff7a910260ffb851fb4bc8a28

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:
  kbuild: make KBUILD_NOCMDDEP=1 handle empty built-in.o
  scripts/kallsyms.c: fix potential segfault
  scripts/gen_initramfs_list.sh: Convert to a /bin/sh script
  kbuild: Fix GNU make v3.80 compatibility
  kbuild: Fix passing -Wno-* options to gcc 4.4+
  kbuild: move scripts/basic/docproc.c to scripts/docproc.c
  kbuild: Fix Makefile.asm-generic for um
  kbuild: Allow to combine multiple W= levels
  kbuild: Disable -Wunused-but-set-variable for gcc 4.6.0
  Fix handling of backlash character in LINUX_COMPILE_BY name
  kbuild: asm-generic support
  kbuild: implement several W= levels
  kbuild: Fix build with binutils <= 2.19
  initramfs: Use KBUILD_BUILD_TIMESTAMP for generated entries
  kbuild: Allow to override LINUX_COMPILE_BY and LINUX_COMPILE_HOST macros
  kbuild: Drop unused LINUX_COMPILE_TIME and LINUX_COMPILE_DOMAIN macros
  kbuild: Use the deterministic mode of ar
  kbuild: Call gzip with -n
  kbuild: move KALLSYMS_EXTRA_PASS from Kconfig to Makefile
  Kconfig: improve KALLSYMS_ALL documentation

Fix up trivial conflict in Makefile
---

2bb732cdb48d271ff7a910260ffb851fb4bc8a28
diff --cc Makefile
index a0344a81a893,d96f56e1bfcd..6b73d1eed1ea
--- a/Makefile
+++ b/Makefile
@@@ -1267,8 -1286,11 +1286,12 @@@ help
  	@echo  '  make O=dir [targets] Locate all output files in "dir", including .config'
  	@echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'
  	@echo  '  make C=2   [targets] Force check of all c source with $$CHECK'
- 	@echo  '  make W=1   [targets] Enable extra gcc checks'
+ 	@echo  '  make W=n   [targets] Enable extra gcc checks, n=1,2,3 where'
+ 	@echo  '		1: warnings which may be relevant and do not occur too often'
+ 	@echo  '		2: warnings which occur quite often but may still be relevant'
+ 	@echo  '		3: more obscure warnings, can most likely be ignored'
+ 	@echo  '		Multiple levels can be combined with W=12 or W=123'
 +	@echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
  	@echo  ''
  	@echo  'Execute "make" or "make all" to build all targets marked with [*] '
  	@echo  'For further info see the ./README file'
diff --cc scripts/gen_initramfs_list.sh
index e12b1a7525cf,8da7890310d6..b482f162a18a
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@@ -284,11 -284,18 +284,18 @@@ while [ $# -gt 0 ]; d
  done
  
  # If output_file is set we will generate cpio archive and compress it
 -# we are carefull to delete tmp files
 +# we are careful to delete tmp files
  if [ ! -z ${output_file} ]; then
  	if [ -z ${cpio_file} ]; then
+ 		timestamp=
+ 		if test -n "$KBUILD_BUILD_TIMESTAMP"; then
+ 			timestamp="$(date -d"$KBUILD_BUILD_TIMESTAMP" +%s || :)"
+ 			if test -n "$timestamp"; then
+ 				timestamp="-t $timestamp"
+ 			fi
+ 		fi
  		cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
- 		usr/gen_init_cpio ${cpio_list} > ${cpio_tfile}
+ 		usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
  	else
  		cpio_tfile=${cpio_file}
  	fi