linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>, Bjorn Helgaas <bhelgaas@google.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Rob Herring <robh@kernel.org>, Simon Xue <xxm@rock-chips.com>
Subject: linux-next: manual merge of the devicetree tree with the pci tree
Date: Fri, 29 Oct 2021 13:24:11 +1100	[thread overview]
Message-ID: <20211029132411.1bd856b0@canb.auug.org.au> (raw)

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

Hi all,

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

  Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml

between commit:

  af7cda832f8a ("dt-bindings: rockchip: Add DesignWare based PCIe controller")

from the pci tree and commit:

  ad854f362e8c ("dt-bindings: rockchip: Add DesignWare based PCIe controller")

from the devicetree tree.

These were almost identical patches.  I went with the former one sonce
it was dated later.

I fixed it up (see above) 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 --]

             reply	other threads:[~2021-10-29  2:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-29  2:24 Stephen Rothwell [this message]
2021-10-29 13:45 ` Rob Herring
  -- strict thread matches above, loose matches on Subject: below --
2022-01-10  0:50 Stephen Rothwell
2020-07-28  5:49 Stephen Rothwell
2020-07-28  8:26 ` Sivaprakash Murugesan
2020-07-28 15:20   ` Rob Herring
2020-05-22  5:58 Stephen Rothwell
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:
  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=20211029132411.1bd856b0@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=bhelgaas@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=robh@kernel.org \
    --cc=robherring2@gmail.com \
    --cc=xxm@rock-chips.com \
    --subject='Re: linux-next: manual merge of the devicetree tree with the pci tree' \
    /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

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).