From: Bjorn Helgaas <helgaas@kernel.org>
To: Vidya Sagar <vidyas@nvidia.com>,
Jon Hunter <jonathanh@nvidia.com>,
Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lorenzo Pieralisi <lpieralisi@kernel.org>,
Thierry Reding <treding@nvidia.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Rob Herring <robh@kernel.org>
Subject: Re: linux-next: manual merge of the pci tree with the arm-soc tree
Date: Tue, 13 Dec 2022 10:21:03 -0600 [thread overview]
Message-ID: <20221213162103.GA106222@bhelgaas> (raw)
In-Reply-To: <20221205095738.607b9551@canb.auug.org.au>
On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the pci tree got a conflict in:
>
> Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml
>
> between commit:
>
> 5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
>
> from the arm-soc tree and commit:
>
> 4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
>
> from the pci tree.
>
> I didn't know how to fix this up, so I just used the latter (and so lost
> the addition of "ecam").
Did I miss a suggested resolution for this?
next prev parent reply other threads:[~2022-12-13 16:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-04 22:57 linux-next: manual merge of the pci tree with the arm-soc tree Stephen Rothwell
2022-12-13 16:21 ` Bjorn Helgaas [this message]
2022-12-13 16:48 ` Thierry Reding
2022-12-13 19:03 ` Serge Semin
2022-12-13 19:53 ` Bjorn Helgaas
2022-12-13 20:07 ` Bjorn Helgaas
2022-12-13 23:36 ` Serge Semin
2022-12-14 14:37 ` Thierry Reding
2022-12-14 22:07 ` Serge Semin
2022-12-15 12:06 ` Thierry Reding
2022-12-15 23:56 ` Serge Semin
-- strict thread matches above, loose matches on Subject: below --
2019-11-06 22:45 Stephen Rothwell
2019-11-07 18:27 ` Olof Johansson
2019-11-07 21:18 ` Bjorn Helgaas
2019-11-08 11:07 ` Lorenzo Pieralisi
2019-11-08 20:18 ` Bjorn Helgaas
2019-11-08 22:29 ` Olof Johansson
2018-04-03 2:00 Stephen Rothwell
2015-08-17 1:08 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=20221213162103.GA106222@bhelgaas \
--to=helgaas@kernel.org \
--cc=Sergey.Semin@baikalelectronics.ru \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=olof@lixom.net \
--cc=robh@kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=treding@nvidia.com \
--cc=vidyas@nvidia.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).