On 9/20/2024 9:15 PM, Krzysztof Kozlowski wrote:
On 20/09/2024 06:08, Tingguo Cheng wrote:
Add compatible string for the RPMh power domains on qcs615 platform.
Signed-off-by: Tingguo Cheng <quic_tingguoc@xxxxxxxxxxx>
---
Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 1 +
1 file changed, 1 insertion(+)
You sent within 30 minutes two independent patchsets touching the same
part of code, so you knew it will lead to conflicts. I don't get how you
imagine this to be applied. I suggest combining patchsets in such case.
I created a new patchset by combining the two patchsets into one to
resolve the conflicts.
20240927-add_qcs615_qcs8300_powerdomains_driver_support-v2-0-18c030ad7b68@xxxxxxxxxxx
|
|<--Patchset 1:Current patchset.
|<--Patchset
2:https://lore.kernel.org/r/20240920-add_qcs8300_powerdomains_driver_support-v1-0-96a2a08841da@xxxxxxxxxxx
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Best regards,
Krzysztof
--
Thank you & BRs
Tingguo