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. Thanks, - Chris. -- Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> One Laptop Per Child -- 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
