dmaengine: fix for cookie changes and merge