On Thu, Feb 6, 2020 at 9:30 AM Stephen Boyd <sboyd@xxxxxxxxxx> 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