linux-next: manual merge of the clk tree with the devicetree-fixes tree

linux-next: manual merge of the clk tree with the devicetree-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

Hi all,

Today's linux-next merge of the clk tree got conflicts in:

  Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml
  Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml

between commit:

  04dbd86539fd ("dt-bindings: Fix paths in schema $id fields")

from the devicetree-fixes tree and commits:

  e6747e24f15d ("dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998")
  8cff43d46cfc ("dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180")

from the clk tree.

I fixed it up (the latter changes seem to have included the former,
plus I removed Documentation/devicetree/bindings/clock/qcom,gpucc.yaml)
and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree

[Stephen Boyd]

Quoting Stephen Rothwell (2020-02-05 13:34:18)
> Hi all,
> 
> Today's linux-next merge of the clk tree got conflicts in:
> 
>   Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml
>   Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml
> 
> between commit:
> 
>   04dbd86539fd ("dt-bindings: Fix paths in schema $id fields")
> 
> from the devicetree-fixes tree and commits:
> 
>   e6747e24f15d ("dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998")
>   8cff43d46cfc ("dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180")
> 
> from the clk tree.
> 
> I fixed it up (the latter changes seem to have included the former,
> plus I removed Documentation/devicetree/bindings/clock/qcom,gpucc.yaml)
> and can carry the fix as necessary.

Thanks Stephen. Rob, you may want to drop the change to qcom,gpucc.yaml
so that conflicts are reduced.

Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree

[Rob Herring]

On Thu, Feb 6, 2020 at 9:30 AM Stephen Boyd <sboyd@kernel.org> wrote:
>
> Quoting Stephen Rothwell (2020-02-05 13:34:18)
> > Hi all,
> >
> > Today's linux-next merge of the clk tree got conflicts in:
> >
> >   Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml
> >   Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml
> >
> > between commit:
> >
> >   04dbd86539fd ("dt-bindings: Fix paths in schema $id fields")
> >
> > from the devicetree-fixes tree and commits:
> >
> >   e6747e24f15d ("dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998")
> >   8cff43d46cfc ("dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180")
> >
> > from the clk tree.
> >
> > I fixed it up (the latter changes seem to have included the former,
> > plus I removed Documentation/devicetree/bindings/clock/qcom,gpucc.yaml)
> > and can carry the fix as necessary.
>
> Thanks Stephen. Rob, you may want to drop the change to qcom,gpucc.yaml
> so that conflicts are reduced.

It's already in Linus' master.

Rob