From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752404AbbIOGqh (ORCPT ); Tue, 15 Sep 2015 02:46:37 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:46079 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752362AbbIOGqg (ORCPT ); Tue, 15 Sep 2015 02:46:36 -0400 Subject: Re: [PATCH v2 11/23] ARM/dmaengine: edma: Merge the two drivers under drivers/dmaengine To: Tony Lindgren References: <1441974442-8233-1-git-send-email-peter.ujfalusi@ti.com> <1441974442-8233-12-git-send-email-peter.ujfalusi@ti.com> <20150914161233.GL4215@atomide.com> CC: , , , , , , , , From: Peter Ujfalusi Message-ID: <55F7BE7C.1080703@ti.com> Date: Tue, 15 Sep 2015 09:45:16 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <20150914161233.GL4215@atomide.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/14/2015 07:12 PM, Tony Lindgren wrote: > * Peter Ujfalusi [150911 05:35]: >> Move the code out from arch/arm/common and merge it inside of the dmaengine >> driver. >> This change is done with as minimal change to the code as possible to avoid >> any possibilities to introducing regression. > > You should check your git config so it uses -M option to git diff > to detect renames. I'm moving the code form arch/arm/common/edma.c inside of the already existing drivers/dma/edma.c The diff looks the same with -M or -C since during the code move most line needed to be changed (struct edma -> struct edma_cc). But the merge itself does not change how the code works at this point. > Anyways, assuming you're just moving code, for > the omap parts: > > Acked-by: Tony Lindgren Thanks, Péter