Re: linux-next: manual merge of the l2-mtd tree with Linus' tree
From: Stephen Rothwell
Date: Mon May 28 2012 - 22:45:05 EST
Hi Artem,
On Tue, 29 May 2012 12:33:01 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> This tree (l2-mtd) needs to be updated since most of its patches (but not
> commits) have been merged into upstream trees. Artem, you and Dave
> Woodhouse need to discuss your work flow. (Or I just need to remove the
> l2-mtd tree from linux-next.)
I fact, I screwed up the various merge resolutions that the above mess
caused, so I just dropped the l2-mtd tree for today. Please fix it up.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgp00000.pgp
Description: PGP signature