[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120529124501.38995df01dfaebcbd5f1b869@canb.auug.org.au>
Date: Tue, 29 May 2012 12:45:01 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Artem Bityutskiy <dedekind1@...il.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Sascha Hauer <s.hauer@...gutronix.de>,
Fabio Estevam <fabio.estevam@...escale.com>,
David Woodhouse <dwmw2@...radead.org>
Subject: Re: linux-next: manual merge of the l2-mtd tree with Linus' tree
Hi Artem,
On Tue, 29 May 2012 12:33:01 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists