| Message ID | 20220817145901.865977-3-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM/hwlock: qcom: switch TCSR mutex to MMIO | expand |
On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > Document new QCS404 TCSR compatible. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + > 1 file changed, 1 insertion(+) Merge conflict. Please rebase. > diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml > index 5d7f4ac21a8d..87b173ad9710 100644 > --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml > +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml > @@ -18,6 +18,7 @@ properties: > items: > - enum: > - qcom,msm8998-tcsr > + - qcom,qcs404-tcsr > - qcom,sc7180-tcsr > - qcom,sc7280-tcsr > - qcom,sdm845-tcsr
On 08/09/2022 09:50, Lee Jones wrote: > On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > >> Document new QCS404 TCSR compatible. >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> --- >> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + >> 1 file changed, 1 insertion(+) > > Merge conflict. Please rebase. I will rebase. Can you check if you pushed your tree? I see updates 3 weeks ago here: https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/ Best regards, Krzysztof
On 08/09/2022 10:15, Krzysztof Kozlowski wrote: > On 08/09/2022 09:50, Lee Jones wrote: >> On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: >> >>> Document new QCS404 TCSR compatible. >>> >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> --- >>> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + >>> 1 file changed, 1 insertion(+) >> >> Merge conflict. Please rebase. > > I will rebase. Can you check if you pushed your tree? I see updates 3 > weeks ago here: > https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/ It seems latest next also has your old tree from Aug 15, so on what exactly I should rebase? Best regards, Krzysztof
On Thu, 08 Sep 2022, Krzysztof Kozlowski wrote: > On 08/09/2022 09:50, Lee Jones wrote: > > On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > > > >> Document new QCS404 TCSR compatible. > >> > >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> --- > >> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + > >> 1 file changed, 1 insertion(+) > > > > Merge conflict. Please rebase. > > I will rebase. Can you check if you pushed your tree? I see updates 3 > weeks ago here: > https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/ This week's updates now pushed.
On Thu, 08 Sep 2022, Krzysztof Kozlowski wrote: > On 08/09/2022 10:15, Krzysztof Kozlowski wrote: > > On 08/09/2022 09:50, Lee Jones wrote: > >> On Wed, 17 Aug 2022, Krzysztof Kozlowski wrote: > >> > >>> Document new QCS404 TCSR compatible. > >>> > >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>> --- > >>> Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + > >>> 1 file changed, 1 insertion(+) > >> > >> Merge conflict. Please rebase. > > > > I will rebase. Can you check if you pushed your tree? I see updates 3 > > weeks ago here: > > https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/ > > It seems latest next also has your old tree from Aug 15, so on what > exactly I should rebase? That was my last day. Only updates since Monday needed pushing - now complete.
diff --git a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml index 5d7f4ac21a8d..87b173ad9710 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml @@ -18,6 +18,7 @@ properties: items: - enum: - qcom,msm8998-tcsr + - qcom,qcs404-tcsr - qcom,sc7180-tcsr - qcom,sc7280-tcsr - qcom,sdm845-tcsr
Document new QCS404 TCSR compatible. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Documentation/devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + 1 file changed, 1 insertion(+)