From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: David Chinner <david@fromorbit.com>,
xfs-masters@oss.sgi.com, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@infradead.org>
Subject: Rebase v. merge (Was: Re: linux-next: manual merge of the xfs tree with the vfs tree)
Date: Tue, 16 Feb 2010 10:16:26 +1100 [thread overview]
Message-ID: <20100216101626.0549dee8.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20100215034417.GV30031@ZenIV.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 988 bytes --]
Hi Al,
On Mon, 15 Feb 2010 03:44:17 +0000 Al Viro <viro@ZenIV.linux.org.uk> wrote:
>
> Actually, I'd cheerfully rebased that sucker (to e.g. write_inode2); it has
> grown a trivial conflict with mainline after one of gfs2 merges and it's
> annoying to fix it up after each for-next rebase.
>
> So I'd rather put a rebased variant and switched the for-next to using that,
> if people who'd pulled it already are OK with that.
Just out of interest, is there some reason you didn't just merge Linus'
tree (or the subset that caused the conflict) into the write-inode
branch. That would have meant that you still had a nonrebasing branch
that others could use. Now anyone who has merged your write_inode branch
needs to rebuild their trees using you new write-rebase2 branch or risk
causing conflicts in linux-next or Linus' tree when their tree's are
merged.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2010-02-15 23:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-15 1:27 linux-next: manual merge of the xfs tree with the vfs tree Stephen Rothwell
2010-02-15 3:44 ` Al Viro
2010-02-15 23:16 ` Stephen Rothwell [this message]
2010-02-15 23:57 ` Rebase v. merge (Was: Re: linux-next: manual merge of the xfs tree with the vfs tree) Al Viro
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=20100216101626.0549dee8.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
--cc=xfs-masters@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
all inboxes | Powered by JetHome®