From: Sam Ravnborg <sam@ravnborg.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] kbuild updates
Date: Fri, 12 Oct 2007 06:16:53 +0200 [thread overview]
Message-ID: <20071012041653.GA16142@uranus.ravnborg.org> (raw)
In-Reply-To: <alpine.LFD.0.999.0710111905420.6887@woody.linux-foundation.org>
On Thu, Oct 11, 2007 at 07:08:53PM -0700, Linus Torvalds wrote:
>
>
> On Wed, 10 Oct 2007, Sam Ravnborg wrote:
> >
> > This set of commits are the kbuild stuff that does not
> > conflict with the pending x86 merge.
>
> Hmm. It does for me, actually.
I did not try it out obviously - I just removed everything touching x86_64/i386.
This is the SRCARCH changes in top-level Makefile.
>
> I fixed up the trivial conflict in the main Makefile, but that seems to
> leave $(ARCH) entirely undefined in my case, so the end result doesn't
> work. That seems to have nothing to do with my conflict fixup, but is
> something else.
>
> It also gets a trivial conflict with the 'mmc' pull I just did, but that
> didn't seem problematic (mmc added a new case to scripts/mod/file2alias.c,
> and you added a free, both at the end of the same function) - but the x86
> merge conflict means that I decided that I'll let you sort it out. It's
> probably really trivial, but I'll merge the other stuff I have pending
> instead.
As Andrew has an issue with my geneius "save ARCH & CROSS_COMPILE" patch
this is perfect. I will sort out the conflicts and Andrew's use-case and
submit a new pull request.
Sam
next prev parent reply other threads:[~2007-10-12 4:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-10 19:44 [GIT PULL] kbuild updates Sam Ravnborg
2007-10-12 2:08 ` Linus Torvalds
2007-10-12 4:16 ` Sam Ravnborg [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-02-09 10:02 Sam Ravnborg
2008-04-28 21:14 Sam Ravnborg
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=20071012041653.GA16142@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=akpm@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox