From: Tom Rini <trini@kernel•crashing.org>
To: Larry McVoy <lm@bitmover•com>
Cc: Paul Mackerras <paulus@samba•org>, linuxppc-dev@lists•linuxppc.org
Subject: Re: 2.5 development
Date: Fri, 15 Feb 2002 10:36:19 -0700 [thread overview]
Message-ID: <20020215173619.GN2004@opus.bloom.county> (raw)
In-Reply-To: <20020215093350.K8353@work.bitmover.com>
On Fri, Feb 15, 2002 at 09:33:50AM -0800, Larry McVoy wrote:
> On Fri, Feb 15, 2002 at 10:32:10AM -0700, Tom Rini wrote:
> > On Fri, Feb 15, 2002 at 08:58:12AM -0800, Larry McVoy wrote:
> > >
> > > On Fri, Feb 15, 2002 at 11:11:57PM +1100, Paul Mackerras wrote:
> > > > The current limitations of BK mean that we will not be able to take
> > > > changesets directly from the linuxppc-2.5 tree and send them to
> > > > Linus.
> > >
> > > You can export changes as a patch and import them.
> >
> > Which still isn't directly. :) It will catch most of the problems, but
> > if you export a patch with new files from one tree, import into another
> > and pull back into the original, you have a file conflict, yes?
>
> Yes, but that's not what we are talking about. We're talking about
> export/import from two "unrelated" BK trees. You can't pull unrelated
> trees at all.
These are related trees. For 2.5.x all of the PPC trees are related to
the official Linus 2.5.x bk tree. Something like:
linux-2.5 -> {for-linus-*, linuxppc-2.5}.
Since linuxppc-2.5 and for-linus-ppc are both children of linux-2.5,
shouldn't they be related?
--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
next prev parent reply other threads:[~2002-02-15 17:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-02-15 12:11 2.5 development Paul Mackerras
2002-02-15 16:40 ` Tom Rini
2002-02-15 16:58 ` Larry McVoy
2002-02-15 17:01 ` Jeff Garzik
2002-02-15 17:06 ` Larry McVoy
2002-02-15 17:17 ` Larry McVoy
2002-02-15 17:32 ` Tom Rini
2002-02-15 17:33 ` Larry McVoy
2002-02-15 17:36 ` Tom Rini [this message]
2002-02-15 18:44 ` Larry McVoy
2002-02-15 18:50 ` Tom Rini
2002-02-15 23:53 ` Larry McVoy
[not found] <p05100300b8a144d7cf05@[66.26.75.241]>
2002-02-26 15:51 ` Stefan Jeglinski
2002-02-26 16:13 ` Tom Rini
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=20020215173619.GN2004@opus.bloom.county \
--to=trini@kernel$(echo .)crashing.org \
--cc=linuxppc-dev@lists$(echo .)linuxppc.org \
--cc=lm@bitmover$(echo .)com \
--cc=paulus@samba$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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