From: Linus Torvalds <torvalds@linux-foundation.org>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-kbuild <linux-kbuild@vger.kernel.org>,
Paul Mundt <lethal@linux-sh.org>
Subject: Re: [GIT PATCH] kbuild updates
Date: Tue, 29 Jan 2008 09:04:38 +1100 (EST) [thread overview]
Message-ID: <alpine.LFD.1.00.0801290901340.3505@www.l.google.com> (raw)
In-Reply-To: <20080128212624.GA3842@uranus.ravnborg.org>
On Mon, 28 Jan 2008, Sam Ravnborg wrote:
>
> Please pull following patches for kbuild/kconfig and a few other areas.
>
> Pull from:
> ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git
This conflicts with the SH updates (sh is also integrating 32/64-bit into
one tree now).
Since I don't know the SH tree or your changes, the probably fairly
trivial manual merge isn't an option (especially as I'm not at home and
doing this on a laptop with a less than ideal keyboard and smaller screen
than I'm used to).
So I hope you and Paul can resolve the conflicts and re-send.
Linus
next prev parent reply other threads:[~2008-01-28 22:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-28 21:26 Sam Ravnborg
2008-01-28 22:04 ` Linus Torvalds [this message]
2008-01-28 22:24 ` Sam Ravnborg
-- strict thread matches above, loose matches on Subject: below --
2006-07-01 10:58 Sam Ravnborg
2006-03-21 16:17 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=alpine.LFD.1.00.0801290901340.3505@www.l.google.com \
--to=torvalds@linux-foundation.org \
--cc=akpm@linux-foundation.org \
--cc=lethal@linux-sh.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sam@ravnborg.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
all inboxes | Powered by JetHome®