All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Boyd <sboyd@kernel.org>
To: Mike Turquette <mturquette@baylibre.com>,
	Rob Herring <robherring2@gmail.com>,
	Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Douglas Anderson <dianders@chromium.org>
Subject: Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree
Date: Thu, 06 Feb 2020 08:30:18 -0800	[thread overview]
Message-ID: <20200206163019.CCE0E214AF@mail.kernel.org> (raw)
In-Reply-To: <20200206083418.3a6025f6@canb.auug.org.au>

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.


  reply	other threads:[~2020-02-06 16:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-05 21:34 linux-next: manual merge of the clk tree with the devicetree-fixes tree Stephen Rothwell
2020-02-06 16:30 ` Stephen Boyd [this message]
2020-02-06 20:50   ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200206163019.CCE0E214AF@mail.kernel.org \
    --to=sboyd@kernel.org \
    --cc=dianders@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=robherring2@gmail.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.