Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20200206083418.3a6025f6@canb.auug.org.au>
References: <20200206083418.3a6025f6@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree
Cc:     Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Douglas Anderson <dianders@chromium.org>
To:     Mike Turquette <mturquette@baylibre.com>,
        Rob Herring <robherring2@gmail.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
From:   Stephen Boyd <sboyd@kernel.org>
User-Agent: alot/0.8.1
Date:   Thu, 06 Feb 2020 08:30:18 -0800
Message-Id: <20200206163019.CCE0E214AF@mail.kernel.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Quoting Stephen Rothwell (2020-02-05 13:34:18)
> Hi all,
>=20
> Today's linux-next merge of the clk tree got conflicts in:
>=20
>   Documentation/devicetree/bindings/clock/qcom,msm8998-gpucc.yaml
>   Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml
>=20
> between commit:
>=20
>   04dbd86539fd ("dt-bindings: Fix paths in schema $id fields")
>=20
> from the devicetree-fixes tree and commits:
>=20
>   e6747e24f15d ("dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/s=
c7180/msm8998")
>   8cff43d46cfc ("dt-bindings: clock: Cleanup qcom,videocc bindings for sd=
m845/sc7180")
>=20
> from the clk tree.
>=20
> 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.