Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200924115731.194ecd6f@canb.auug.org.au> <20200925083748.GJ25109@dragon>
In-Reply-To: <20200925083748.GJ25109@dragon>
From:   Shawn Guo <shawnguo@kernel.org>
Date:   Fri, 25 Sep 2020 16:46:20 +0800
Message-ID: <CAJBJ56JR3UyPkG2k9+1rKu9DwEN4PZObtk1nKiiBoe0j5-17AQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the pci tree with the imx-mxs tree
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>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, Sep 25, 2020 at 4:37 PM Shawn Guo <shawnguo@kernel.org> wrote:
>
> 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.

Okay, just saw the message from Lorenzo telling that the patch had
been dropped from his tree.

Shawn