On Fri, 25 Mar 2011, Chris Ball wrote: > Hi, > > On Fri, Mar 25 2011, Guennadi Liakhovetski wrote: > >> > [1/2] mmc: tmio: Improve DMA stability on sh-mobile > >> > >> Some serious merge conflicts with Linus W's dmaengine cleanup here. > > > > Sorry, I must be missing something. I'm basing my patches on the current > > (of yesterday) next tree, which already contains Linus' patches: > > I agree that linux-next contains these patches, but I don't agree that > "mmc: tmio: Improve DMA stability on sh-mobile" (which was written back > on March 7th before they were merged) avoids merge conflicts with them. Ok, now I understand: I rebased those patches locally, but forgot to resend, sorry. Coming in a minute. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
