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@xxxxxxxxx> 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-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
