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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200206163019.CCE0E214AF@mail.kernel.org>
Date:   Thu, 06 Feb 2020 08:30:18 -0800
From:   Stephen Boyd <sboyd@...nel.org>
To:     Mike Turquette <mturquette@...libre.com>,
        Rob Herring <robherring2@...il.com>,
        Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Douglas Anderson <dianders@...omium.org>
Subject: Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree

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.