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;
MIME-Version: 1.0
References: <20200206083418.3a6025f6@canb.auug.org.au> <20200206163019.CCE0E214AF@mail.kernel.org>
In-Reply-To: <20200206163019.CCE0E214AF@mail.kernel.org>
From:   Rob Herring <robherring2@gmail.com>
Date:   Thu, 6 Feb 2020 13:50:46 -0700
Message-ID: <CAL_JsqKxJ9T9a9sDUdVnHgmk5B=24KcXgXm3808EWf-NY=sq7g@mail.gmail.com>
Subject: Re: linux-next: manual merge of the clk tree with the
 devicetree-fixes tree
To:     Stephen Boyd <sboyd@kernel.org>
Cc:     Mike Turquette <mturquette@baylibre.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Douglas Anderson <dianders@chromium.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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