Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in
drivers/mtd/maps/bcm963xx-flash.c between commit 4e549d6d4a32 ("MTD:
MAPS: bcm963xx-flash.c: explicitly include module.h") from Linus' tree
and commit 573052d2e4a4 ("mtd: maps: remove the now unused
bcm963xx-flash") from the l2-mtd tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgprMDKq5m534.pgp
Description: PGP signature
