Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the clk tree with the devicetree-fixes tree
@ 2020-02-05 21:34 Stephen Rothwell
  2020-02-06 16:30 ` Stephen Boyd
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2020-02-05 21:34 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd, Rob Herring
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Douglas Anderson

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

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. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree
  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
  2020-02-06 20:50   ` Rob Herring
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Boyd @ 2020-02-06 16:30 UTC (permalink / raw)
  To: Mike Turquette, Rob Herring, Stephen Rothwell
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Douglas Anderson

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.


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the clk tree with the devicetree-fixes tree
  2020-02-06 16:30 ` Stephen Boyd
@ 2020-02-06 20:50   ` Rob Herring
  0 siblings, 0 replies; 3+ messages in thread
From: Rob Herring @ 2020-02-06 20:50 UTC (permalink / raw)
  To: Stephen Boyd
  Cc: Mike Turquette, Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Douglas Anderson

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2020-02-06 20:50   ` Rob Herring

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git