From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753383AbcJDHno (ORCPT <rfc822;w@1wt.eu>);
        Tue, 4 Oct 2016 03:43:44 -0400
Received: from mout.kundenserver.de ([212.227.17.10]:52261 "EHLO
        mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751414AbcJDHnm (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 4 Oct 2016 03:43:42 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>,
        Fabio Estevam <fabio.estevam@nxp.com>,
        Peter Senna Tschudin <peter.senna@collabora.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Nandor Han <nandor.han@ge.com>, Dave Jiang <dave.jiang@intel.com>,
        Michael Olbrich <m.olbrich@pengutronix.de>, dmaengine@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] dmaengine: imx-sdma: fix merge conflict
Date: Tue, 04 Oct 2016 09:43:16 +0200
Message-ID: <4437512.2pceIHeqFq@wuerfel>
User-Agent: KMail/5.1.3 (Linux/4.4.0-34-generic; KDE/5.18.0; x86_64; ; )
In-Reply-To: <20160923034556.GJ2609@localhost>
References: <20160915155118.3008739-1-arnd@arndb.de> <2910910.lNZx7XPZak@wuerfel> <20160923034556.GJ2609@localhost>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:t1DeC3RUC7M49NcM/QHl4/i2Y/TGld/6eQpBoqVd0RCMvBGH5OJ
 ypTh3Dr5/xFhHD/20lUmwY9eqk0UhUuUDs8+vLghSUwRe3xcGOagiWQf9B234pBKYsUU62X
 zon51qwesnUzbcR71zz8eccgEb5EHzei7hNOVv7XZwSq7TM/Udso07GHzkz4cp1rLfCqTpy
 Iks/BKtZcENW1hPNFYU+Q==
X-UI-Out-Filterresults: notjunk:1;V01:K0:qtINlZ9qrR0=:vgx33D2WvG4l3l+RO20jrD
 Ikz7QuhY29I2o1sgWxP2z02grOjtyY/uzt89zcMeFKVV58oT3HRRynweS59csXRyR/mmWcO/a
 BJL+RCwQ9sOH0klqAGlbLWZ7AXAv2L62PjCq03JnHgcPZ94LESYQ+4CG6KaTZ8+4D7oXynjLA
 RCcXQy5unEsvqvYcTDX/gPTywrnWBIh1Y55HQENLwQQcSqQkPzu1900WNGnGxXL7WfoHjB3f1
 u1GiLstREg2Q99hS5YXyHFlGqs3Pf8oWaFxFxb11qCxevHgKIpEXmPbLMhWDhRlX0WHBUPjDp
 cSlyVHKtmb49cROUY0llE37Tnw5Wku5tZBuOKx1D6n/z1rxbBkl8p0BvDxwbxanqNk9zUQnED
 Pns4vvczdvxf79kvQ/E2jxz4TpujhNZc63zuvzCU2n052xHVI3kCqTJ1LbDG9i7uDvUw3OAEQ
 EqNf53nV3/I2dwYDxIyaSrn5IWwzFGwEyHeqWeN6AWubMIN/y4857BBCCt12gUgG1QaMa5dQJ
 gUVleF8wAhfZau18szfBJRf4LE6jMh8A5ngcyYUR/mOoCniucOwWViK01Tgq3ZThzYDLNr5ft
 JEYo2/3p0e2E7Mme3qG11fhrb3DgOJcVowxjmWoI3SReoik2vlP3CCC557EGhcblJvKjl0hjE
 akvhujsm6O7cTbf6F53EJA+CvIAPUUyXQXPtyvVtL5P3AyaDPmOsijZxlpPHn6wxq5lqGpjqD
 tIHxdK1EDQ/9DsE8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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