2011-05-27 04:00:43

by Stephen Rothwell

Subject: linux-next: manual merge of the mtd tree with Linus' tree

Hi David,

Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/maps/physmap.c between commit b7281ca2a4b0 ("ARM: 6904/1:
MTD: Add integrator-flash feature to physmap") from Linus' tree and
commit 984e6d8ec5ab ("mtd: physmap: convert to mtd_device_register()")
from the mtd tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.

--
Cheers,
Stephen Rothwell [email protected]

diff --cc drivers/mtd/maps/physmap.c
index 1a9b94f,d205926..0000000
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@@ -92,10 -65,7 +81,8 @@@ static const char *rom_probe_types[] =
"qinfo_probe",
"map_rom",
NULL };
- #ifdef CONFIG_MTD_PARTITIONS
-static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "afs",
+ NULL };
- #endif

static int physmap_flash_probe(struct platform_device *dev)
{

2011-05-27 07:53:46

by Artem Bityutskiy

Subject: Re: linux-next: manual merge of the mtd tree with Linus' tree

On Fri, 2011-05-27 at 14:00 +1000, ext Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the mtd tree got a conflict in
> drivers/mtd/maps/physmap.c between commit b7281ca2a4b0 ("ARM: 6904/1:
> MTD: Add integrator-flash feature to physmap") from Linus' tree and
> commit 984e6d8ec5ab ("mtd: physmap: convert to mtd_device_register()")
> from the mtd tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Yes, this looks right, thanks.

--
Best Regards,
Artem Bityutskiy (Артём Битюцкий)