Re: linux-next: manual merge of the staging tree with the l2-mtdtree
From: Artem Bityutskiy
Date: Wed Dec 28 2011 - 03:52:13 EST
On Wed, 2011-12-28 at 17:54 +1100, Stephen Rothwell wrote:
> Hi Greg,
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/spectra/lld_mtd.c between a series of commits from the
> l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
> from the staging tree.
> I just removed the file.
Oh, it is in staging, I somehow missed that and pushed a small clean-up
to the MTD tree (because the driver is an MTD driver). I'll kill that
Apologies for the hassle.
Description: This is a digitally signed message part