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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
