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: <ef71ab54-d337-1c4c-9b90-ca39b1c1ed17@linaro.org>
Date:   Fri, 30 Sep 2022 18:28:10 +0200
From:   Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To:     Lee Jones <lee@...nel.org>
Cc:     broonie@...nel.org, Bjorn Andersson <andersson@...nel.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 mfd tree with the qcom tree

On 30/09/2022 14:45, Lee Jones wrote:
> On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:
> 
>> On 30/09/2022 13:58, broonie@...nel.org wrote:
>>> Hi all,
>>>
>>> Today's linux-next merge of the mfd tree got a conflict in:
>>>
>>>   Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml
>>>
>>
>> Thanks Mark.
>>
>>> between commit:
>>>
>>>   4f2e28b2cc2e0 ("dt-bindings: mfd: qcom,tcsr: add several devices")
>>
>> It seems this commit was picked by both Bjorn/qcom and Lee/MFD.
>>
>>>
>>> from the qcom tree and commits:
>>>
>>>   f8c1940165bea ("dt-bindings: mfd: qcom,tcsr: Add several devices")
>>>   a328ae8504dbc ("dt-bindings: mfd: qcom,tcsr: Drop simple-mfd from IPQ6018")
>>
>> This commit depends on the duplicated one (on "Add several devices"), so
>> I think all set can stay in MFD and instead Bjorn could drop his copy of
>> the commit.
> 
> Not sure why Bjorn is picking up MFD patches?
> 
> Was this a mistake Bjorn?


This was a part of big set MFD + ARM64 dts, so I guess it just slipped in:

https://lore.kernel.org/all/20220819083209.50844-1-krzysztof.kozlowski@linaro.org/

Best regards,
Krzysztof

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ