linux-kernel - Re: linux-next: manual merge of the writeback tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20110726052303.GA3315@localhost>
Date:	Tue, 26 Jul 2011 13:23:03 +0800
From:	Wu Fengguang <fengguang.wu@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Dave Chinner <dchinner@...hat.com>,
	Christoph Hellwig <hch@...radead.org>,
	Al Viro <viro@...IV.linux.org.uk>
Subject: Re: linux-next: manual merge of the writeback tree with the vfs
 tree

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@...el.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/