lkml.org 
[lkml]   [2016]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] dmaengine: imx-sdma: fix merge conflict
Date
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@arndb.de>
> 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?

Arnd

\
 
 \ /
  Last update: 2016-09-23 00:02    [W:0.186 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site