From: Shawn Guo <shawnguo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Wasim Khan <wasim.khan@nxp.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Xiaowei Bao <xiaowei.bao@nxp.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with the imx-mxs tree
Date: Fri, 25 Sep 2020 16:37:49 +0800 [thread overview]
Message-ID: <20200925083748.GJ25109@dragon> (raw)
In-Reply-To: <20200924115731.194ecd6f@canb.auug.org.au>
On Thu, Sep 24, 2020 at 11:57:31AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
>
> between commit:
>
> f7d48ffcfc6e ("arm64: dts: layerscape: Add label to pcie nodes")
>
> from the imx-mxs tree and commit:
>
> c9443b6500ff ("arm64: dts: layerscape: Add PCIe EP node for ls1088a")
>
> from the pci tree.
It should go through imx-mxs -> arm-soc, not pci tree.
Shawn
>
> 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 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> index ff5805206a28,f21dd143ab6d..000000000000
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi
> @@@ -517,7 -499,18 +517,18 @@@
> status = "disabled";
> };
>
> + pcie-ep@3400000 {
> + compatible = "fsl,ls1088a-pcie-ep","fsl,ls-pcie-ep";
> + reg = <0x00 0x03400000 0x0 0x00100000
> + 0x20 0x00000000 0x8 0x00000000>;
> + reg-names = "regs", "addr_space";
> + num-ib-windows = <24>;
> + num-ob-windows = <128>;
> + max-functions = /bits/ 8 <2>;
> + status = "disabled";
> + };
> +
> - pcie@3500000 {
> + pcie2: pcie@3500000 {
> compatible = "fsl,ls1088a-pcie";
> reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */
> 0x28 0x00000000 0x0 0x00002000>; /* configuration space */
> @@@ -543,7 -536,17 +554,17 @@@
> status = "disabled";
> };
>
> + pcie-ep@3500000 {
> + compatible = "fsl,ls1088a-pcie-ep","fsl,ls-pcie-ep";
> + reg = <0x00 0x03500000 0x0 0x00100000
> + 0x28 0x00000000 0x8 0x00000000>;
> + reg-names = "regs", "addr_space";
> + num-ib-windows = <6>;
> + num-ob-windows = <8>;
> + status = "disabled";
> + };
> +
> - pcie@3600000 {
> + pcie3: pcie@3600000 {
> compatible = "fsl,ls1088a-pcie";
> reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */
> 0x30 0x00000000 0x0 0x00002000>; /* configuration space */
next prev parent reply other threads:[~2020-09-25 8:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 1:57 linux-next: manual merge of the pci tree with the imx-mxs tree Stephen Rothwell
2020-09-25 8:37 ` Shawn Guo [this message]
2020-09-25 8:46 ` Shawn Guo
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=20200925083748.GJ25109@dragon \
--to=shawnguo@kernel.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=wasim.khan@nxp.com \
--cc=xiaowei.bao@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).