On Tue, 2012-01-03 at 14:00 +1100, Stephen Rothwell wrote: > Hi Artem, > > Today's linux-next merge of the l2-mtd tree got a conflict in > fs/logfs/dev_mtd.c between commit d1cc3ad397f2 ("Logfs: Allow NULL > block_isbad() methods") from the logfs tree and commit 957afd905eda > ("logfs: do not use 'mtd->block_isbad' directly") from the l2-mtd tree. > > I fixed it up (see below) and can carry the fix as necessary. Thanks Stephen, this fix up is good. -- Best Regards, Artem Bityutskiy
Attachment:
signature.asc
Description: This is a digitally signed message part