Re: linux-next: manual merge of the dmaengine tree with the phy-next tree

Hi Stephen, On 21-07-20, 16:17, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the dmaengine tree got a conflict in: > > MAINTAINERS > > between commit: > > 4a33bea00314 ("phy: zynqmp: Add PHY driver for the Xilinx ZynqMP Gigabit > Transceiver") > > from the phy-next t

linux-next: manual merge of the dmaengine tree with the phy-next tree

Hi all, Today's linux-next merge of the dmaengine tree got a conflict in: MAINTAINERS between commit: 4a33bea00314 ("phy: zynqmp: Add PHY driver for the Xilinx ZynqMP Gigabit Transceiver") from the phy-next tree and commit: ef9303fdf46f ("dt: bindings: dma: xilinx: dpdma: DT bindings f