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

[Vinod Koul <vkoul@kernel.org>]

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 tree and commit:
> 
>   ef9303fdf46f ("dt: bindings: dma: xilinx: dpdma: DT bindings for Xilinx DPDMA")
> 
> from the dmaengine tree.

Thanks the fix looks okay.

> 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 495e4247cbb0,1ba09904354f..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -11432,20 -11364,14 +11434,13 @@@ L:	linux-arm-kernel@lists.infradead.or
>   S:	Supported
>   F:	drivers/usb/gadget/udc/atmel_usba_udc.*
>   
>  -MICROSEMI ETHERNET SWITCH DRIVER
>  -M:	Alexandre Belloni <alexandre.belloni@bootlin.com>
>  -M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
>  -L:	netdev@vger.kernel.org
>  +MICROCHIP WILC1000 WIFI DRIVER
>  +M:	Ajay Singh <ajay.kathat@microchip.com>
>  +M:	Claudiu Beznea <claudiu.beznea@microchip.com>
>  +L:	linux-wireless@vger.kernel.org
>   S:	Supported
>  -F:	drivers/net/ethernet/mscc/
>  -F:	include/soc/mscc/ocelot*
>  +F:	drivers/net/wireless/microchip/wilc1000/
>   
> - MICROCHIP XDMA DRIVER
> - M:	Ludovic Desroches <ludovic.desroches@microchip.com>
> - L:	linux-arm-kernel@lists.infradead.org
> - L:	dmaengine@vger.kernel.org
> - S:	Supported
> - F:	drivers/dma/at_xdmac.c
> - 
>   MICROSEMI MIPS SOCS
>   M:	Alexandre Belloni <alexandre.belloni@bootlin.com>
>   M:	Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
> @@@ -18990,15 -18847,15 +18985,24 @@@ F:	Documentation/devicetree/bindings/me
>   F:	drivers/media/platform/xilinx/
>   F:	include/uapi/linux/xilinx-v4l2-controls.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
>  +
> + 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
> + 
>   XILLYBUS DRIVER
>   M:	Eli Billauer <eli.billauer@gmail.com>
>   L:	linux-kernel@vger.kernel.org



-- 
~Vinod