archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Rob Herring <>, Bjorn Helgaas <>
Cc: Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Kishon Vijay Abraham I <>,
	Lorenzo Pieralisi <>
Subject: linux-next: manual merge of the devicetree tree with the pci tree
Date: Fri, 22 May 2020 15:58:58 +1000	[thread overview]
Message-ID: <> (raw)

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

Hi all,

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


between commit:

  fb5f8f3ca5f8 ("dt-bindings: PCI: cadence: Deprecate inbound/outbound specific bindings")

from the pci tree and commit:

  3d21a4609335 ("dt-bindings: Remove cases of 'allOf' containing a '$ref'")

from the devicetree tree.

I fixed it up (the former removed the section modified by the latter,
so I just did that) 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.

Stephen Rothwell

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

             reply	other threads:[~2020-05-22  5:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-22  5:58 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-01-10  0:50 Stephen Rothwell
2021-10-29  2:24 Stephen Rothwell
2021-10-29 13:45 ` Rob Herring
2020-07-28  5:49 Stephen Rothwell
2020-07-28  8:26 ` Sivaprakash Murugesan
2020-07-28 15:20   ` Rob Herring
2018-01-25 20:34 Stephen Rothwell

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:

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

  git send-email \ \ \ \ \ \ \ \ \
    --subject='Re: linux-next: manual merge of the devicetree tree with the pci tree' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).