• Linus Torvalds's avatar
    Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 2bb732cd
    Linus Torvalds authored
    * '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
    2bb732cd
Makefile 52.3 KB