Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the devicetree tree with the samsung-krzk tree
@ 2019-09-03  5:37 Stephen Rothwell
  2019-09-03  6:32 ` Krzysztof Kozlowski
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2019-09-03  5:37 UTC (permalink / raw)
  To: Rob Herring, Krzysztof Kozlowski
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Guillaume Gardet

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

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt

between commit:

  5833f5a5daf3 ("dt-bindings: gpu: mali: Add Samsung exynos5250 compatible")

from the samsung-krzk tree and commit:

  553cedf60056 ("dt-bindings: Convert Arm Mali Midgard GPU to DT schema")

from the devicetree tree.

I fixed it up (I just removed the txt file, some fixup will be requide for
the new yaml file) 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 devicetree tree with the samsung-krzk tree
  2019-09-03  5:37 linux-next: manual merge of the devicetree tree with the samsung-krzk tree Stephen Rothwell
@ 2019-09-03  6:32 ` Krzysztof Kozlowski
  2019-09-03  6:45   ` Rob Herring
  0 siblings, 1 reply; 3+ messages in thread
From: Krzysztof Kozlowski @ 2019-09-03  6:32 UTC (permalink / raw)
  To: Stephen Rothwell, Rob Herring
  Cc: Rob Herring, Linux Next Mailing List, Linux Kernel Mailing List,
	Guillaume Gardet

On Tue, 3 Sep 2019 at 07:37, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>   Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
>
> between commit:
>
>   5833f5a5daf3 ("dt-bindings: gpu: mali: Add Samsung exynos5250 compatible")
>
> from the samsung-krzk tree and commit:
>
>   553cedf60056 ("dt-bindings: Convert Arm Mali Midgard GPU to DT schema")
>
> from the devicetree tree.
>
> I fixed it up (I just removed the txt file, some fixup will be requide for
> the new yaml file) and can carry the fix as necessary. This is now fixed

Thanks Stephen.

Rob,
The conflict is non trivial. I could drop the patch, so Guillaume
could rebase his patch on top of next and send it again for inclusion
through your tree. Any other ideas?

The patch itself:
https://patchwork.kernel.org/patch/11123729/

Best regards,
Krzysztof

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

* Re: linux-next: manual merge of the devicetree tree with the samsung-krzk tree
  2019-09-03  6:32 ` Krzysztof Kozlowski
@ 2019-09-03  6:45   ` Rob Herring
  0 siblings, 0 replies; 3+ messages in thread
From: Rob Herring @ 2019-09-03  6:45 UTC (permalink / raw)
  To: Krzysztof Kozlowski
  Cc: Stephen Rothwell, Linux Next Mailing List,
	Linux Kernel Mailing List, Guillaume Gardet

On Tue, Sep 3, 2019 at 7:32 AM Krzysztof Kozlowski <krzk@kernel.org> wrote:
>
> On Tue, 3 Sep 2019 at 07:37, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt
> >
> > between commit:
> >
> >   5833f5a5daf3 ("dt-bindings: gpu: mali: Add Samsung exynos5250 compatible")
> >
> > from the samsung-krzk tree and commit:
> >
> >   553cedf60056 ("dt-bindings: Convert Arm Mali Midgard GPU to DT schema")
> >
> > from the devicetree tree.
> >
> > I fixed it up (I just removed the txt file, some fixup will be requide for
> > the new yaml file) and can carry the fix as necessary. This is now fixed
>
> Thanks Stephen.
>
> Rob,
> The conflict is non trivial. I could drop the patch, so Guillaume
> could rebase his patch on top of next and send it again for inclusion
> through your tree. Any other ideas?

That would be best. I doubt Linus wants to learn json-schema. :)

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 --
2019-09-03  5:37 linux-next: manual merge of the devicetree tree with the samsung-krzk tree Stephen Rothwell
2019-09-03  6:32 ` Krzysztof Kozlowski
2019-09-03  6:45   ` 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 linux-next@archiver.kernel.org
	public-inbox-index linux-next


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