From: Wu Fengguang <fengguang.wu@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Dave Chinner <dchinner@redhat.com>,
Christoph Hellwig <hch@infradead.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Subject: Re: linux-next: manual merge of the writeback tree with the vfs tree
Date: Tue, 26 Jul 2011 13:23:03 +0800 [thread overview]
Message-ID: <20110726052303.GA3315@localhost> (raw)
In-Reply-To: <20110726151451.e3385a5d969fddc210f186f8@canb.auug.org.au>
Stephen,
On Tue, Jul 26, 2011 at 01:14:51PM +0800, Stephen Rothwell wrote:
> Hi,
>
> On Tue, 26 Jul 2011 12:58:12 +0800 Wu Fengguang <fengguang.wu@intel.com> wrote:
> >
> > What should I do with the 2 conflicts for upstream merge?
> >
> > I noticed that Linus just merged the vfs tree. So the obvious thing I
> > could do is to rebase writeback.git to Linus' tree and fix the
> > conflicts, and then ask Linus to pull the rebased writeback tree.
> >
> > Or are there better practices?
>
> Normally you just ask Linus to pull your tree and let him know that there
> are some conflicts and also ask him to let you know if he wants you to
> fix them up before merging. He is a smart fellow, and if I worked it out,
> I am sure he can as well. :-)
>
> Some people pull Linus' tree into theirs and resolve the conflicts, but
> he prefers to do them himself usually.
Good point. Thank you for the nice guide!
Thanks,
Fengguang
next prev parent reply other threads:[~2011-07-26 5:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 7:34 linux-next: manual merge of the writeback tree with the vfs tree Stephen Rothwell
2011-07-23 14:44 ` Wu Fengguang
2011-07-26 4:58 ` Wu Fengguang
2011-07-26 5:14 ` Stephen Rothwell
2011-07-26 5:23 ` Wu Fengguang [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-18 7:29 Stephen Rothwell
2011-07-23 14:43 ` Wu Fengguang
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=20110726052303.GA3315@localhost \
--to=fengguang.wu@intel.com \
--cc=dchinner@redhat.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@ZenIV.linux.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.