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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAJBJ56JR3UyPkG2k9+1rKu9DwEN4PZObtk1nKiiBoe0j5-17AQ@mail.gmail.com>
Date:   Fri, 25 Sep 2020 16:46:20 +0800
From:   Shawn Guo <shawnguo@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Bjorn Helgaas <bhelgaas@...gle.com>,
        Wasim Khan <wasim.khan@....com>,
        Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
        Xiaowei Bao <xiaowei.bao@....com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with the imx-mxs tree

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