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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20161004080238.GE2467@localhost>
Date:   Tue, 4 Oct 2016 13:32:38 +0530
From:   Vinod Koul <vinod.koul@...el.com>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     Dan Williams <dan.j.williams@...el.com>,
        Fabio Estevam <fabio.estevam@....com>,
        Peter Senna Tschudin <peter.senna@...labora.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Nandor Han <nandor.han@...com>,
        Dave Jiang <dave.jiang@...el.com>,
        Michael Olbrich <m.olbrich@...gutronix.de>,
        dmaengine@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] dmaengine: imx-sdma: fix merge conflict

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