Messages in this thread | | | Date | Fri, 24 Jul 2020 16:01:58 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the phy-next tree with the dmaengine tree |
| |
Hi all,
Today's linux-next merge of the phy-next tree got a conflict in:
MAINTAINERS
between commit:
ef9303fdf46f ("dt: bindings: dma: xilinx: dpdma: DT bindings for Xilinx DPDMA")
from the dmaengine tree and commit:
4a33bea00314 ("phy: zynqmp: Add PHY driver for the Xilinx ZynqMP Gigabit Transceiver")
from the phy-next tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc MAINTAINERS index f9bba40873cc,82a12abe24c6..000000000000 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -19007,15 -18852,15 +19007,24 @@@ F: Documentation/devicetree/bindings/me F: drivers/media/platform/xilinx/ F: include/uapi/linux/xilinx-v4l2-controls.h +XILINX ZYNQMP DPDMA DRIVER +M: Hyun Kwon <hyun.kwon@xilinx.com> +M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +L: dmaengine@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml +F: drivers/dma/xilinx/xilinx_dpdma.c +F: include/dt-bindings/dma/xlnx-zynqmp-dpdma.h + + XILINX ZYNQMP PSGTR PHY DRIVER + M: Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx.com> + M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> + L: linux-kernel@vger.kernel.org + S: Supported + T: git https://github.com/Xilinx/linux-xlnx.git + F: Documentation/devicetree/bindings/phy/xlnx,zynqmp-psgtr.yaml + F: drivers/phy/xilinx/phy-zynqmp.c + XILLYBUS DRIVER M: Eli Billauer <eli.billauer@gmail.com> L: linux-kernel@vger.kernel.org [unhandled content-type:application/pgp-signature] | |