linux-kernel - Re: linux-next: manual merge of the usb tree with the qcom 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 for Android: free password hash cracker in your pocket

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

Date:   Tue, 21 Sep 2021 15:16:27 +0200
From:   Greg KH <greg@...ah.com>
To:     Bjorn Andersson <bjorn.andersson@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Andy Gross <agross@...nel.org>,
        Baruch Siach <baruch@...s.co.il>,
        Kathiravan T <kathirav@...eaurora.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the usb tree with the qcom tree

On Tue, Sep 21, 2021 at 06:12:06AM -0700, Bjorn Andersson wrote:
> On Mon 20 Sep 19:30 PDT 2021, Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the usb tree got a conflict in:
> > 
> >   arch/arm64/boot/dts/qcom/ipq6018.dtsi
> > 
> > between commit:
> > 
> >   261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description")
> > 
> > from the qcom tree and commit:
> > 
> >   9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description")
> > 
> 
> Greg, this is not a USB patch, can you please drop it from your tree.

It was sent to me and says "add usb3 DT description", so how am I
supposed to know to reject it?

I'll go revert it from my tree.  {sigh}

greg k-h