linux-kernel - Re: [GIT PULL] kbuild updates for 2.6.33

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20091208151416.GA13535@sepie.suse.cz>
Date:	Tue, 8 Dec 2009 16:14:16 +0100
From:	Michal Marek <mmarek@...e.cz>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] kbuild updates for 2.6.33

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@...e.cz>
Subject: [PATCH] kbuild: fix make clean after mismerge

Fix typo / thinko in commit 698699f.

Signed-off-by: Michal Marek <mmarek@...e.cz>
---
 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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/