From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754753AbbJOHQ4 (ORCPT ); Thu, 15 Oct 2015 03:16:56 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:58529 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754290AbbJOHQw (ORCPT ); Thu, 15 Oct 2015 03:16:52 -0400 Subject: Re: [PATCH v5 00/24] dmaengine/ARM: Merge the edma drivers into one To: Vinod Koul References: <1444822986-20562-1-git-send-email-peter.ujfalusi@ti.com> <20151014143124.GU27370@localhost> CC: , , , , , , , From: Peter Ujfalusi Message-ID: <561F52BC.7040903@ti.com> Date: Thu, 15 Oct 2015 10:16:12 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151014143124.GU27370@localhost> 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 10/14/2015 05:31 PM, Vinod Koul wrote: > On Wed, Oct 14, 2015 at 02:42:42PM +0300, Peter Ujfalusi wrote: >> Hi, >> >> Cover letter: >> >> with this series the edma two driver setup will be changed to have only one >> driver to support eDMA3. The legacy edma interface will be removed and eDMA can >> only be used via dmaengine API from this point on. >> In order to do the merge the following improvements has been done: >> - One driver instance per eDMA: >> - Any number of eDMA instances are supported (both legacy and DT boot) >> - Not relying on global variables, arrays, etc >> - Code simplification and optimizations in several places >> >> This change will also help us to do bigger changes in the eDMA driver since, >> since now we have only one driver to work with. > > I have applied this now. I got a conlfict on 3rd one while applying and also > I got conflict while merging to next > > Pls verify all is well! Thanks Vinod, It looks fine. It is strange since I'm working on top of linux-next as well. The following commit caused the conflict: ddfe4d0cce78 dmaengine: edma: remove redundant conditions I have it in my linux-next, but for some reason it is missing from your topic/edma, so the series applied with conflicts there and when merging on top of linux-next there were again conflict. Thank you, Péter