Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the devicetree tree with the etnaviv tree
@ 2020-02-11 23:46 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-02-11 23:46 UTC (permalink / raw)
  To: Rob Herring, Lucas Stach
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Guido Günther

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

Hi all,

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

  Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt

between commit:

  22567d017c2c ("dt-bindings: etnaviv: Add #cooling-cells")

from the etnaviv tree and commit:

  90aeca875f8a ("dt-bindings: display: Convert etnaviv to json-schema")

from the devicetree tree.

I fixed it up (I just dropped the etnaviv tree change ... someone should
maybe add that change to the devicetree tree) 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] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-11 23:46 linux-next: manual merge of the devicetree tree with the etnaviv tree Stephen Rothwell

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