Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/mtd/maps/pxa2xx-flash.c between commit 51fb8326bc12 ("mtd:
pxa2xx-flash.c: use mtd_device_parse_register") from the l2-mtd tree and
commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
resource_size(ptr)") from the trivial tree.
Just context changes. I did the obvious fixup and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpJCKyfK53fR.pgp
Description: PGP signature
