Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1495243 > unrolled thread

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

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  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

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

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@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

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

	Arnd

[toc] | [next] | [standalone]

#1495246

On Tue, Oct 04, 2016 at 09:43:16AM +0200, Arnd Bergmann wrote:
> 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@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
> 
> The problem was fixed after you applied the patch, but it seems the
> same one is now back in linux-next.

Opps I am sorry for that.

To prepare for pull request I rebased my next, and I fixed it while merging
with tty. I was planning to send this to Linus as reference.

But then i had to redo this as I merged some other code not going
for 4.9 and messed up in second try.

Thanks for pointing it out. It is fixed now and pushed

-- 
~Vinod

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web