I've found myself in a situation where I want to have things that are in the 3.18 kernel, but also the ADI drivers in the xcomm_zynq branch, so I naively tried to merge them.
However, trying to simply have git merge xilinx/master-next with adi/xcomm_zynq resulted in tons of conflicts on the DMA parts. The other parts I could clearly solve. The DMA code changes however I couldn't make sense of, as both sides have moved files around.
So I'm looking for some advice here, which is the right path to go here?