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 S933666AbcIVLm7 (ORCPT <rfc822;w@1wt.eu>);
        Thu, 22 Sep 2016 07:42:59 -0400
Received: from mout.kundenserver.de ([212.227.126.133]:54900 "EHLO
        mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S933568AbcIVLm6 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 22 Sep 2016 07:42:58 -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: Thu, 22 Sep 2016 13:42:35 +0200
Message-ID: <2910910.lNZx7XPZak@wuerfel>
User-Agent: KMail/5.1.3 (Linux/4.4.0-34-generic; KDE/5.18.0; x86_64; ; )
In-Reply-To: <20160915155118.3008739-1-arnd@arndb.de>
References: <20160915155118.3008739-1-arnd@arndb.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:o3Nalf+TT4Uj6Aws6VXxlwCjRQ5MApwrLAs2krfauSmGEnP9S7O
 X+chB96aV1I6ocMzY4rlwlBEN5/dr8+aruUOS041AaexKmpvXbReyHKLGNPQn+YwGlG7fAq
 wWAk8liol6qUAiabmhYCQBx1zjuKbKq7rWjpscWJfsFICJNpoNivcuYY86/CME6F/caws0m
 u3fYJldY588cptSkZSatw==
X-UI-Out-Filterresults: notjunk:1;V01:K0:HXyiY2X4v90=:69WPLz7pxUgjQW6e4NKH/f
 9ZkmUXWZ5IzS0zvgga8k0ssoOydyuY8V21V46pFULEnleNaJa0Qro+3myk8YkTZ+f4AppFEOL
 9wkotcBmPkqB5e6p2hSC8XeuzDVjHWNXNtIxRMavvKdNv9y4jC6kZ2SD15rEOrIgcD6Lm+5l8
 pbYT5YTnFAF+fvBpgs3XRcwEVft1zuoa5r2CLt28UxwJ5w7NkCGkDzu8gSFge0pOrUm6Jr5xg
 N8eGIwFIQ9tH3zgMwa1ozUG/4ZLXvvUoYt9ZxEY40ApF6rThTcjImRuiXp624SgSSBSx4M947
 gpIL39R2tddLJgLZhqxBbMbBf2b4hByD0Qpj7xJfapyg8HdSTXTI43Nnp76aY8TkLWkVCTo//
 Qnx2QSKVuUk4l6f1grqjbyMzzQqfvA0F/nMKW1CVTZ4WWi7EaWGjI7pZS2vCXv+A1pZRQyl0w
 iuwaeLLcfDrMJOgmUBDtD1zpd8Vkm6ZbFbzkn4l+XwIRnhDWCMsLROA2TsPVk0gQkiTYcj6ci
 zFKYmkvdg1fBRo+yFaWpRA3/lsXmNXAcSlziSdyN54AVXIyiQgDcYhQGRliQuTEsH6Gyw65Ev
 FitSztELx6YoywoEeEMFgAVoPCBRjuZQbbHWRF1EsnR0OF1GoGasmTVMeP3B1f+eQbsBeIsfZ
 py/PIMKhjFmlfg45gs7R8I94pBJmCuDFYOzhjWhVlOgWdDbwPCUS64emNKisGN7XLLQPw+vi4
 qKnFnRGgBvfiNyCH
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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?

	Arnd