Re: linux-next: manual merge of the pci tree with the imx-mxs tree

[Shawn Guo]

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