From: Christoph Hellwig <hch@infradead.org>
To: Dave Chinner <david@fromorbit.com>
Cc: Christoph Hellwig <hch@infradead.org>,
xfs@oss.sgi.com, Alex Elder <aelder@sgi.com>
Subject: Re: XFS Master Branch Rebase
Date: Wed, 28 Jul 2010 07:19:46 -0400 [thread overview]
Message-ID: <20100728111946.GA10824@infradead.org> (raw)
In-Reply-To: <20100728110954.GG655@dastard>
On Wed, Jul 28, 2010 at 09:09:54PM +1000, Dave Chinner wrote:
> If you call a single merge of 2.6.35-rc6 back into the for-2.6.36
> branch a "merge mess", then I'm guilty as charged. However (and it
> is a *BIG* however),
It wasn't that simple. We had a few unclean merges from mainline and
from for-linux to for-2.6.36 or similar branches.
> I haven't asked Alex to pull from that tree
> and upstream should not be pulling from downstream trees without a
> specific request to do so.
>
> I'm maintaining that whole tree for _my_ benefit - I need a
> mainline-based tree that also contains all the non-mainline XFS
> commits, and I need to be able to update them independently. Just
> because the tree contains a branch named "for-2.6.36" and has XFS
> commits that are not yet upstream doesn't mean the branch is a
> upstream pull target.
Yeah. The normal way to maintain a development branch is to stay
is to never pull in mainline into an existing branch. If we absolutely
need to update to a newer version from Linus' tree it should be rebased
ontop of it. Unfortunately we'll need to do this once in a while
for something like XFS which has rather complex interactions with core
VM and VFS changes, so expecting the xfs development branch to be
a stable target is not generally a good idea.
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2010-07-28 11:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 16:16 XFS Master Branch Rebase Alex Elder
2010-07-27 23:27 ` Dave Chinner
2010-07-28 8:44 ` Christoph Hellwig
2010-07-28 11:09 ` Dave Chinner
2010-07-28 11:19 ` Christoph Hellwig [this message]
2010-07-28 16:18 ` Alex Elder
2010-07-28 16:43 ` Alex Elder
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=20100728111946.GA10824@infradead.org \
--to=hch@infradead.org \
--cc=aelder@sgi.com \
--cc=david@fromorbit.com \
--cc=xfs@oss.sgi.com \
/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