On 20/09/2024 06:08, Tingguo Cheng wrote:I created a new patchset by combining the two patchsets into one to resolve the conflicts.
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.
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Best regards,
Krzysztof