Re: [PATCH] dmaengine: imx-sdma: fix merge conflict

[Arnd Bergmann]

On Friday, September 23, 2016 9:15:57 AM CEST Vinod Koul wrote:
> On Thu, Sep 22, 2016 at 01:42:35PM +0200, Arnd Bergmann wrote:
> > On Thursday, September 15, 2016 5:50:49 PM CEST Arnd Bergmann wrote:
> > > The sdma_handle_channel_loop() function was modified in one patch
> > > and removed in another, and the merge between those patches left
> > > an unused function in place:
> > > 
> > > drivers/dma/imx-sdma.c:673:13: error: 'sdma_handle_channel_loop' defined but not used [-Werror=unused-function]
> > > 
> > > This removes it again.
> > > 
> > > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> > > Fixes: 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
> > > Fixes: 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
> > > ---
> > 
> > Hi Vinod,
> > 
> > I still see the warning in linux-next, can you apply the patch?
> 
> Applied, now. Sorry had missed earlier

The problem was fixed after you applied the patch, but it seems the
same one is now back in linux-next.

	Arnd