Messages in this thread | | | Subject | Re: linux-next: manual merge of the mtd tree with Linus' tree | From | Artem Bityutskiy <> | Date | Fri, 27 May 2011 10:43:44 +0300 |
| |
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/integrator-flash.c between commit adf0040096e4 ("ARM: > 6906/1: MTD: Remove integrator-flash") from Linus' tree and commit > ee0e87b174bb ("mtd: convert remaining users to mtd_device_register()") > from the mtd tree. > > The former removes the file updated by the latter, so I just removed it.
Yes, this is right, thanks.
-- Best Regards, Artem Bityutskiy (Артём Битюцкий)
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |