linux-kernel - Re: [PATCH v2 01/10] dt-bindings: mfd: qcom,tcsr: Document msm8953 compatible

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]

Date:   Tue, 22 Feb 2022 07:53:06 +0000
From:   Lee Jones <lee.jones@...aro.org>
To:     Luca Weiss <luca@...tu.xyz>
Cc:     linux-arm-msm@...r.kernel.org,
        ~postmarketos/upstreaming@...ts.sr.ht, phone-devel@...r.kernel.org,
        Konrad Dybcio <konrad.dybcio@...ainline.org>,
        Rob Herring <robh@...nel.org>, Andy Gross <agross@...nel.org>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Rob Herring <robh+dt@...nel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
        devicetree@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 01/10] dt-bindings: mfd: qcom,tcsr: Document msm8953
 compatible

On Mon, 21 Feb 2022, Luca Weiss wrote:

> Hi Lee,
> 
> On Montag, 21. Februar 2022 09:48:01 CET Lee Jones wrote:
> > On Sun, 20 Feb 2022, Luca Weiss wrote:
> > > Document the compatible for tcsr found in msm8953.
> > > 
> > > Signed-off-by: Luca Weiss <luca@...tu.xyz>
> > > Acked-by: Konrad Dybcio <konrad.dybcio@...ainline.org>
> > > Acked-by: Rob Herring <robh@...nel.org>
> > > ---
> > > Changes in v2:
> > > - no changes
> > > 
> > >  Documentation/devicetree/bindings/mfd/qcom,tcsr.txt | 1 +
> > >  1 file changed, 1 insertion(+)
> > 
> > This is already applied.
> 
> Sorry, last week you wrote[0]
> 
> [0] https://lore.kernel.org/linux-arm-msm/YgujkzAezfFBNRDP@google.com/

Yes, that's strange.

I don't remember fixing that merge conflict.

Perhaps I did.  Must have been in a good mood. :)

> > Doesn't seem to apply.
> >
> > Could you please rebase.
> 
> and it wasn't part of linux-next as of yesterday.

Tree has been updated this morning.  Should be in -next tomorrow.

-- 
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog