From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Kishon Vijay Abraham I <kishon@ti•com>, Vinod Koul <vkoul@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Laurent Pinchart <laurent.pinchart@ideasonboard•com>,
Hyun Kwon <hyun.kwon@xilinx•com>,
Michal Simek <michal.simek@xilinx•com>,
Anurag Kumar Vulisha <anurag.kumar.vulisha@xilinx•com>
Subject: linux-next: manual merge of the phy-next tree with the dmaengine tree
Date: Fri, 24 Jul 2020 16:01:58 +1000 [thread overview]
Message-ID: <20200724160158.2528b206@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1852 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2020-07-24 6:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200724160158.2528b206@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=anurag.kumar.vulisha@xilinx$(echo .)com \
--cc=hyun.kwon@xilinx$(echo .)com \
--cc=kishon@ti$(echo .)com \
--cc=laurent.pinchart@ideasonboard$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michal.simek@xilinx$(echo .)com \
--cc=vkoul@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox