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 S1757794AbcIWDhd (ORCPT <rfc822;w@1wt.eu>);
        Thu, 22 Sep 2016 23:37:33 -0400
Received: from mga02.intel.com ([134.134.136.20]:44896 "EHLO mga02.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1754548AbcIWDha (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 22 Sep 2016 23:37:30 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.30,380,1470726000"; 
   d="scan'208";a="1035007566"
Date: Fri, 23 Sep 2016 09:15:57 +0530
From: Vinod Koul <vinod.koul@intel.com>
To: Arnd Bergmann <arnd@arndb.de>
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
Message-ID: <20160923034556.GJ2609@localhost>
References: <20160915155118.3008739-1-arnd@arndb.de>
 <2910910.lNZx7XPZak@wuerfel>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2910910.lNZx7XPZak@wuerfel>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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