Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1489731
| From | Vinod Koul <vinod.koul@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH] dmaengine: imx-sdma: fix merge conflict |
| Date | 2016-09-23 05:40 +0200 |
| Message-ID | <skpvb-6MX-3@gated-at.bofh.it> (permalink) |
| References | <shHeV-rB-1@gated-at.bofh.it> <skaFQ-5LW-31@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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@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?
Applied, now. Sorry had missed earlier
--
~Vinod
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH] dmaengine: imx-sdma: fix merge conflict Arnd Bergmann <arnd@arndb.de> - 2016-09-15 18:00 +0200
Re: [PATCH] dmaengine: imx-sdma: fix merge conflict Arnd Bergmann <arnd@arndb.de> - 2016-09-22 13:50 +0200
Re: [PATCH] dmaengine: imx-sdma: fix merge conflict Vinod Koul <vinod.koul@intel.com> - 2016-09-23 05:40 +0200
Re: [PATCH] dmaengine: imx-sdma: fix merge conflict Arnd Bergmann <arnd@arndb.de> - 2016-10-04 09:50 +0200
Re: [PATCH] dmaengine: imx-sdma: fix merge conflict Vinod Koul <vinod.koul@intel.com> - 2016-10-04 10:00 +0200
csiph-web