linux-kernel - Re: linux-next: manual merge of the qcom tree with the usb 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210806112353.GA33586@sirena.org.uk>
Date:   Fri, 6 Aug 2021 12:23:53 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc:     Andy Gross <agross@...nel.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@...ainline.org>
Subject: Re: linux-next: manual merge of the qcom tree with the usb tree

On Fri, Aug 06, 2021 at 01:08:26PM +0200, Greg Kroah-Hartman wrote:
> On Fri, Aug 06, 2021 at 11:21:38AM +0100, Mark Brown wrote:

> > diff --cc arch/arm64/boot/dts/qcom/msm8996.dtsi
> > index 78c55ca10ba9,31686950004e..000000000000
> > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> 
> Love the fix, did something go wrong?  :)

The fix will be whatever was in HEAD.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)