From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Ball Subject: Re: outstanding tmio patches Date: Fri, 25 Mar 2011 09:09:14 -0400 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: In-Reply-To: (Guennadi Liakhovetski's message of "Fri, 25 Mar 2011 09:04:02 +0100 (CET)") Sender: linux-sh-owner@vger.kernel.org To: Guennadi Liakhovetski Cc: linux-sh@vger.kernel.org, linux-mmc@vger.kernel.org, Ian Molton , Magnus Damm , Samuel Ortiz , Paul Mundt , Linus Walleij List-Id: linux-mmc@vger.kernel.org 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 One Laptop Per Child