On Tue, Dec 08, 2009 at 02:30:04PM +0100, Michal Marek wrote: > Hi Linus, > > these are the kbuild patches I collected for 2.6.33. There might be a few > more later, but this is the main part. > > Thanks, > Michal > > The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d: > Linus Torvalds (1): > Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip > > are available in the git repository at: > > git://repo.or.cz/linux-kbuild.git for-next > ... > Michal Marek (4): > kbuild: generate modules.builtin This patch broke make clean unfortunatelly. The for-next branch already has a fix (commit e1cf87b), please, if you already fetched the branch, fetch again. I'm attaching the fix for reference. Michal --- From: Michal Marek <mmarek@xxxxxxx> Subject: [PATCH] kbuild: fix make clean after mismerge Fix typo / thinko in commit 698699f. Signed-off-by: Michal Marek <mmarek@xxxxxxx> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 391fcb3..8491b21 100644 --- a/Makefile +++ b/Makefile @@ -1174,7 +1174,7 @@ clean: archclean $(clean-dirs) \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.symtypes' -o -name 'modules.order' \ - -o modules.order -o -name '.tmp_*.o.*' \ + -o -name modules.builtin -o -name '.tmp_*.o.*' \ -o -name '*.gcno' \) -type f -print | xargs rm -f # mrproper - Delete all generated files, including .config -- 1.6.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
