* Russ Dill <[email protected]> [090407 15:41]:
> f64f3007, "omap_hsmmc: Flush posted write to IRQ" doesn't change any files.
> 
> It appears that the patch in question is here:
> 
> http://patchwork.kernel.org/patch/16515/
> 
> But it looks like it would have created a conflict with b420f201,
> "MMC: OMAP: flush posted write to IRQ". The f64f3007 patch adds a read
> in two places, but the b420f201 patch only adds a read in one place.

Thanks, looks like I need to fix that in omap-pool, otherwise git merge
will automerge that one.
 
> It also apears that e6cb736 "Initial import of extra code in
> arch/arm/*omap* into omap-pool branch", sets arch/arm/plat-omap/dma.c
> to mode 755, and the merge a01c39f, "Merge branch 'omap-fixes'" keeps
> that mode.

Hmm, I wonder how that got set.. Should be fixed now.

Once I have the omap-pool patches broken down into individual patches,
this constant merging should calm down a bit.

Regards,

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to