Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ef71ab54-d337-1c4c-9b90-ca39b1c1ed17@linaro.org>
Date:   Fri, 30 Sep 2022 18:28:10 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.0
Subject: Re: linux-next: manual merge of the mfd tree with the qcom tree
To:     Lee Jones <lee@kernel.org>
Cc:     broonie@kernel.org, Bjorn Andersson <andersson@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220930115816.128513-1-broonie@kernel.org>
 <1e9a21a3-d6c3-3f76-18dc-ff14e8609846@linaro.org>
 <Yzbk/6SQdpNQTahV@google.com>
Content-Language: en-US
From:   Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
In-Reply-To: <Yzbk/6SQdpNQTahV@google.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 30/09/2022 14:45, Lee Jones wrote:
> On Fri, 30 Sep 2022, Krzysztof Kozlowski wrote:
> 
>> On 30/09/2022 13:58, broonie@kernel.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