Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
fs/jffs2/erase.c between commit 10934478e44d ("mtd: do use mtd->point
directly") from Linus' tree and commit aa64d929dfae ("jffs2: do not
initialize variable unnecessarily") from the l2-mtd tree.
The commit from Linus' tree above is also in the l2-mtd tree. This is
because the l2-mtd tree commits were (at least partially) rebased before
being merged into Linus' tree.
I just used the l2-mtd tree version. But this tree needs cleaning up to
represent what was actually merged upstream.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpGjpbbM7nE9.pgp
Description: PGP signature
