All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] kbuild updates for 2.6.33
Date: Tue, 8 Dec 2009 16:14:16 +0100	[thread overview]
Message-ID: <20091208151416.GA13535@sepie.suse.cz> (raw)
In-Reply-To: <20091208133004.GA22750@sepie.suse.cz>

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

Fix typo / thinko in commit 698699f.

Signed-off-by: Michal Marek <mmarek@suse.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


  reply	other threads:[~2009-12-08 15:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-08 13:30 [GIT PULL] kbuild updates for 2.6.33 Michal Marek
2009-12-08 15:14 ` Michal Marek [this message]
2009-12-09  9:33 ` Michal Marek
2009-12-09 17:31   ` Randy Dunlap
2009-12-09 19:20     ` Sam Ravnborg
2009-12-10 14:12       ` Michal Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091208151416.GA13535@sepie.suse.cz \
    --to=mmarek@suse.cz \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.