linux-kernel - Re: [PATCH 29/29] arm64: dts: qcom: Harmonize DWC USB3 DT nodes name

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] [thread-next>] [day] [month] [year] [list]

Message-ID: <YPrmTYQJ33AIxcwP@kroah.com>
Date:   Fri, 23 Jul 2021 17:54:53 +0200
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     Bjorn Andersson <bjorn.andersson@...aro.org>
Cc:     Serge Semin <fancer.lancer@...il.com>,
        Krzysztof Kozlowski <krzk@...nel.org>,
        Rob Herring <robh+dt@...nel.org>,
        Serge Semin <Sergey.Semin@...kalelectronics.ru>,
        John Stultz <john.stultz@...aro.org>,
        Felipe Balbi <balbi@...nel.org>,
        Florian Fainelli <f.fainelli@...il.com>,
        Andy Gross <agross@...nel.org>,
        "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" 
        <devicetree@...r.kernel.org>,
        linux-arm-msm <linux-arm-msm@...r.kernel.org>,
        Linux USB List <linux-usb@...r.kernel.org>,
        lkml <linux-kernel@...r.kernel.org>,
        linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>,
        Amit Pundir <amit.pundir@...aro.org>
Subject: Re: [PATCH 29/29] arm64: dts: qcom: Harmonize DWC USB3 DT nodes name

On Fri, Jul 23, 2021 at 09:34:20AM -0500, Bjorn Andersson wrote:
> On Fri 23 Jul 03:18 CDT 2021, Greg Kroah-Hartman wrote:
> 
> > On Wed, Jul 21, 2021 at 03:09:37PM -0500, Bjorn Andersson wrote:
> > > Which tree did you revert this in? 5.13.stable?)
> > 
> > My usb-linus branch which will go to Linus later today.  Then we can
> > backport the revert to older kernels as needed.
> > 
> 
> I'm not worried about the backports, I'm worried about conflicts you're
> causing because you're taking a non-usb patch through the usb tree.
> 
> I was about to push a revert (to this and the other Qualcomm platforms),
> but as you're taking some set of reverts through the usb tree we're just
> in for a bunch of merge conflicts.

It shouldn't be a merge conflict as you can apply the same revert to
your tree now and keep on merging.  When you pick up 5.14-rc3 from Linus
it should merge "correctly", right?

thanks,

greg k-h