* Ivan Djelic <ivan.djelic@xxxxxxxxxx> [120510 10:49]: > On Thu, May 10, 2012 at 04:52:18PM +0100, Artem Bityutskiy wrote: > > On Thu, 2012-05-10 at 17:17 +0200, Ivan Djelic wrote: > > > But in order to do so, I need the changes that Afzal has submitted > > > (in particular [3]). Those changes (and as a consequence, my new patch) > > > won't hit 3.5. > > > > > > So, when Afzal's patches are pushed, I'll submit a new, single MTD patch. > > > > But this is not going to happen this merge window as I understood, may > > be not even the next one. We need to make UBIFS happy sooner than that, > > I think. So may be we go forward with your original patch? > > I'm OK with this too, as the patches are ready and tested. > The MTD patch is [2], it depends on [1] which has been pushed, then dropped by Tony. > Do you need me to repost [2] ? > > Tony, sorry to backpedal on this: would you re-push patch [1], if indeed Afzal's patches > are not going to be merged soon ? In the meantime, I can prepare a patch on top of Afzal's to > have a smooth transition w.r.t BCH support. What do you think ? Yes this is OK with me as this removes the blocker for UBIFS work. For arch/arm/mach-omap2/gpmc.c, I have the following two patches queued: 27aeb3da5f97c55f61d92e3dbfb738762f76dc32 Merge tag 'omap-cleanup-for-v3.5' into tmp-merge 2c65e7440d56b3b285d1c95563b4dcce8e40dea3 GPMC: add ECC control definitions 355f8eee48134ba10ca81664ee90eeb240f5f928 ARM: OMAP2+: GPMC: resolve type-conversion warning from sparse Looks your patch applies to v3.4-rc6 and what I have queued without conflicts, so I suggest you merge both via MTD patches: Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> > [1] http://lists.infradead.org/pipermail/linux-mtd/2012-April/040965.html > [2] http://lists.infradead.org/pipermail/linux-mtd/2012-April/041020.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
