From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AB15C433E1 for ; Tue, 21 Jul 2020 06:17:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA445206E9 for ; Tue, 21 Jul 2020 06:17:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Xw7uJzgI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726455AbgGUGRP (ORCPT ); Tue, 21 Jul 2020 02:17:15 -0400 Received: from ozlabs.org ([203.11.71.1]:33463 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725294AbgGUGRP (ORCPT ); Tue, 21 Jul 2020 02:17:15 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4B9pKM2t9Kz9sPB; Tue, 21 Jul 2020 16:17:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1595312232; bh=WZV4+iRfMoNQK9wg0RRfY4PHdeJb/n3hoO/d0GU546o=; h=Date:From:To:Cc:Subject:From; b=Xw7uJzgIArTiwFZ3/KtVCzAo4+8RWha7oFtD+JuM6HwS0APox65ODZhw9GwM20NT2 6noQKC+6Fw8fyCEsBktegcA51zIYk+HrtbTyNswEMKpQHDKkzvP+SNvSZcw3BsQPrc 1NLbiVN3LbV6qURnltHkUTyewCWqUy2WPcRwygduXLX6smi12qQdIGtmuUcNfYEoRw +msUArYVxgTvyz8i+/X4xZuJw9AIA8ipyDZac4AGengfBEaH/Aolgb1knBgti6kaqU n34GDSLpq0S3CRW3AGRerku01kIB3cMQZlaz/eq+8LxdVLV/BaMy94aMAhko2vEwXT GnJLWgUk2aVmg== Date: Tue, 21 Jul 2020 16:17:01 +1000 From: Stephen Rothwell To: Vinod Koul , Kishon Vijay Abraham I Cc: Linux Next Mailing List , Linux Kernel Mailing List , Anurag Kumar Vulisha , Laurent Pinchart , Hyun Kwon , Michal Simek Subject: linux-next: manual merge of the dmaengine tree with the phy-next tree Message-ID: <20200721161701.64b4245e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/JiCKaOVGPzTJDq2Or+8rB07"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/JiCKaOVGPzTJDq2Or+8rB07 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable 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 D= PDMA") from the dmaengine 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. --=20 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.* =20 -MICROSEMI ETHERNET SWITCH DRIVER -M: Alexandre Belloni -M: Microchip Linux Driver Support -L: netdev@vger.kernel.org +MICROCHIP WILC1000 WIFI DRIVER +M: Ajay Singh +M: Claudiu Beznea +L: linux-wireless@vger.kernel.org S: Supported -F: drivers/net/ethernet/mscc/ -F: include/soc/mscc/ocelot* +F: drivers/net/wireless/microchip/wilc1000/ =20 - MICROCHIP XDMA DRIVER - M: Ludovic Desroches - L: linux-arm-kernel@lists.infradead.org - L: dmaengine@vger.kernel.org - S: Supported - F: drivers/dma/at_xdmac.c -=20 MICROSEMI MIPS SOCS M: Alexandre Belloni M: Microchip Linux Driver Support @@@ -18990,15 -18847,15 +18985,24 @@@ F: Documentation/devicetree/bindings/= me F: drivers/media/platform/xilinx/ F: include/uapi/linux/xilinx-v4l2-controls.h =20 +XILINX ZYNQMP PSGTR PHY DRIVER +M: Anurag Kumar Vulisha +M: Laurent Pinchart +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 + M: Laurent Pinchart + 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 +=20 XILLYBUS DRIVER M: Eli Billauer L: linux-kernel@vger.kernel.org --Sig_/JiCKaOVGPzTJDq2Or+8rB07 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl8WiF0ACgkQAVBC80lX 0Gwj/Qf+MKcSU4OQfFBRgPufNkEFYoqsaXF7AuA6u8CqtM0rZHn7PNPg4l0ZctQk Ra0G76mVnHoPlog12gnGROwHn2dpjuyuknrYKg5fUJEH3J+o72emqexzhCrjm82I vDjrMBJ5M/ECwnmtj/2UY7dPSC1Dsw+YDzXuxSLlo4t7BJ0HzyglboByIwjgRfDw 6cmqGUHQzdfxpGHmivInBgwa88eFHv7F6pdEKJoZjHmiWY7hlv0IfViH4qj6XuL1 u2MdGKnkIVnkcDKLQvc0GuSlp74ZK6e8jQHFN5zqmEbzoHTYyP3hz0hGxbhjXBa+ d7KV9iDAe6SX/QZ3Xhhrh2oRw/3t2g== =2GWy -----END PGP SIGNATURE----- --Sig_/JiCKaOVGPzTJDq2Or+8rB07--