> -----Original Message----- > From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] > Sent: 2008年12月11日 18:24 > To: Dmitry Eremin-Solenikov > Cc: David Woodhouse; linux-next@xxxxxxxxxxxxxxx; Eric Miao; Russell King > Subject: Re: linux-next: manual merge of the mtd tree > > Hi Dmitry, > > On Thu, 11 Dec 2008 13:11:20 +0300 "Dmitry Eremin-Solenikov" > <dbaryshkov@xxxxxxxxx> wrote: > > > > Unfortunately those changes are independant, so I don't quite > > understand what to do. > > If you'd prefer, I can provide merged versions of all 3 files, so that > > you can use this > > as merge resolution via git-rerere. Is that suitable for you? > > That would be a great help, thanks. I can do a trivial merge of mtd tree and resolve this, but it would be more reasonable if the merge can be made within one tree (I don't think cross-merging back-n-forth is something interesting) -- 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
