diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 00:37:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 00:37:02 +0200 |
| commit | c37efa932598de5e30330a1414e34d9e082e0d9e (patch) | |
| tree | 1e3b782d257fa39a54f583af3dc7c32d7cffc67d /usr | |
| parent | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 (diff) | |
| parent | Use macros for .data.page_aligned section. (diff) | |
| download | linux-c37efa932598de5e30330a1414e34d9e082e0d9e.tar.xz linux-c37efa932598de5e30330a1414e34d9e082e0d9e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)
Use macros for .data.page_aligned section.
Use macros for .bss.page_aligned section.
Use new __init_task_data macro in arch init_task.c files.
kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
kbuild: add static to prototypes
kbuild: fail build if recordmcount.pl fails
kbuild: set -fconserve-stack option for gcc 4.5
kbuild: echo the record_mcount command
gconfig: disable "typeahead find" search in treeviews
kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling
checkincludes.pl: add option to remove duplicates in place
markup_oops: use modinfo to avoid confusion with underscored module names
checkincludes.pl: provide usage helper
checkincludes.pl: close file as soon as we're done with it
ctags: usability fix
kernel hacking: move STRIP_ASM_SYMS from General
gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
kbuild: Check if linker supports the -X option
kbuild: introduce ld-option
...
Fix trivial conflict in scripts/basic/fixdep.c
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/.gitignore | 2 | ||||
| -rw-r--r-- | usr/Makefile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/usr/.gitignore b/usr/.gitignore index 69b2e89fa165..8e48117a3f3d 100644 --- a/usr/.gitignore +++ b/usr/.gitignore @@ -4,5 +4,7 @@ gen_init_cpio initramfs_data.cpio initramfs_data.cpio.gz +initramfs_data.cpio.bz2 +initramfs_data.cpio.lzma initramfs_list include diff --git a/usr/Makefile b/usr/Makefile index 245145a99c10..1e6a9e4a72cc 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -6,7 +6,7 @@ klibcdirs:; PHONY += klibcdirs -# Gzip, but no bzip2 +# Gzip suffix_$(CONFIG_INITRAMFS_COMPRESSION_GZIP) = .gz # Bzip2 |