Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
Linus Torvalds [Thu, 28 Oct 2010 22:13:55 +0000 (15:13 -0700)]
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  initramfs: Fix build break on symbol-prefixed archs
  initramfs: fix initramfs size calculation
  initramfs: generalize initramfs_data.xxx.S variants
  scripts/kallsyms: Enable error messages while hush up unnecessary warnings
  scripts/setlocalversion: update comment
  kbuild: Use a single clean rule for kernel and external modules
  kbuild: Do not run make clean in $(srctree)
  scripts/mod/modpost.c: fix commentary accordingly to last changes
  kbuild: Really don't clean bounds.h and asm-offsets.h

1  2 
Documentation/kbuild/makefiles.txt
Kbuild
Makefile
include/asm-generic/vmlinux.lds.h
init/initramfs.c
scripts/Makefile.lib
scripts/mod/modpost.c
scripts/setlocalversion

Simple merge
diff --cc Kbuild
Simple merge
diff --cc Makefile
Simple merge
  
  #ifdef CONFIG_BLK_DEV_INITRD
  #define INIT_RAM_FS                                                   \
 -      . = ALIGN(PAGE_SIZE);                                           \
 +      . = ALIGN(4);                                                   \
        VMLINUX_SYMBOL(__initramfs_start) = .;                          \
        *(.init.ramfs)                                                  \
-       VMLINUX_SYMBOL(__initramfs_end) = .;
+       . = ALIGN(8);                                                   \
+       *(.init.ramfs.info)
  #else
  #define INIT_RAM_FS
  #endif
Simple merge
Simple merge
@@@ -1230,9 -1218,9 +1233,9 @@@ static char *sec2annotation(const char 
                        strcat(p, "data ");
                else
                        strcat(p, " ");
-               return r; /* we leak her but we do not care */
+               return r;
        } else {
 -              return "";
 +              return strdup("");
        }
  }
  
Simple merge