| Message ID | 20240920-add_qcs615_powerdomains_driver_support-v1-1-8846efaf9454@quicinc.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Add rpmhpd power domains driver support for QCS615 | expand |
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@quicinc.com> > --- > 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@linaro.org> Best regards, Krzysztof
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@quicinc.com> >> --- >> 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@quicinc.com | |<--Patchset 1:Current patchset. |<--Patchset 2:https://lore.kernel.org/r/20240920-add_qcs8300_powerdomains_driver_support-v1-0-96a2a08841da@quicinc.com > > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Best regards, > Krzysztof > >
On 27/09/2024 14:16, Tingguo Cheng wrote: > > > 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@quicinc.com> >>> --- >>> 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@quicinc.com > | > |<--Patchset 1:Current patchset. > |<--Patchset > 2:https://lore.kernel.org/r/20240920-add_qcs8300_powerdomains_driver_support-v1-0-96a2a08841da@quicinc.com > >> >> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> And this? Please carefully read your internal go/upstream guides and in-kernel submitting patches before posting. Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml index 929b7ef9c1bcdae8194adfdfd6114573ab4d59cd..b4f4ea905667a94806f632166db54384bc9de8e3 100644 --- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml +++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml @@ -32,6 +32,7 @@ properties: - qcom,msm8998-rpmpd - qcom,qcm2290-rpmpd - qcom,qcs404-rpmpd + - qcom,qcs615-rpmhpd - qcom,qdu1000-rpmhpd - qcom,qm215-rpmpd - qcom,sa8155p-rpmhpd
Add compatible string for the RPMh power domains on qcs615 platform. Signed-off-by: Tingguo Cheng <quic_tingguoc@quicinc.com> --- Documentation/devicetree/bindings/power/qcom,rpmpd.yaml | 1 + 1 file changed, 1 insertion(+)