All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thierry Reding <treding@nvidia.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Vidya Sagar <vidyas@nvidia.com>,
	Jon Hunter <jonathanh@nvidia.com>,
	Serge Semin <Sergey.Semin@baikalelectronics.ru>,
	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>,
	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 17:48:53 +0100	[thread overview]
Message-ID: <Y5is9cp6WdWixwgU@orome> (raw)
In-Reply-To: <20221213162103.GA106222@bhelgaas>

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

On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> 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?

We had a brief discussion about this in another thread. So basically
Stephen's resolution is fine here and the plan is to instead add the
ECAM bits that the Tegra patch does in a separate patch on top of
Serge's patch. I should get around to sending that patch tomorrow.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Thierry Reding <treding@nvidia.com>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Vidya Sagar <vidyas@nvidia.com>,
	Jon Hunter <jonathanh@nvidia.com>,
	Serge Semin <Sergey.Semin@baikalelectronics.ru>,
	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>,
	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 17:48:53 +0100	[thread overview]
Message-ID: <Y5is9cp6WdWixwgU@orome> (raw)
In-Reply-To: <20221213162103.GA106222@bhelgaas>


[-- Attachment #1.1: Type: text/plain, Size: 1005 bytes --]

On Tue, Dec 13, 2022 at 10:21:03AM -0600, Bjorn Helgaas wrote:
> 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?

We had a brief discussion about this in another thread. So basically
Stephen's resolution is fine here and the plan is to instead add the
ECAM bits that the Tegra patch does in a separate patch on top of
Serge's patch. I should get around to sending that patch tomorrow.

Thierry

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  reply	other threads:[~2022-12-13 16:49 UTC|newest]

Thread overview: 39+ 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-04 22:57 ` Stephen Rothwell
2022-12-13 16:21 ` Bjorn Helgaas
2022-12-13 16:21   ` Bjorn Helgaas
2022-12-13 16:48   ` Thierry Reding [this message]
2022-12-13 16:48     ` Thierry Reding
2022-12-13 19:03     ` Serge Semin
2022-12-13 19:03       ` Serge Semin
2022-12-13 19:53       ` Bjorn Helgaas
2022-12-13 19:53         ` Bjorn Helgaas
2022-12-13 20:07         ` Bjorn Helgaas
2022-12-13 20:07           ` Bjorn Helgaas
2022-12-13 23:36           ` Serge Semin
2022-12-13 23:36             ` Serge Semin
2022-12-14 14:37             ` Thierry Reding
2022-12-14 14:37               ` Thierry Reding
2022-12-14 22:07               ` Serge Semin
2022-12-14 22:07                 ` Serge Semin
2022-12-15 12:06                 ` Thierry Reding
2022-12-15 12:06                   ` Thierry Reding
2022-12-15 23:56                   ` Serge Semin
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-06 22:45 ` Stephen Rothwell
2019-11-07 18:27 ` Olof Johansson
2019-11-07 18:27   ` Olof Johansson
2019-11-07 21:18   ` Bjorn Helgaas
2019-11-07 21:18     ` Bjorn Helgaas
2019-11-08 11:07     ` Lorenzo Pieralisi
2019-11-08 11:07       ` Lorenzo Pieralisi
2019-11-08 20:18       ` Bjorn Helgaas
2019-11-08 20:18         ` Bjorn Helgaas
2019-11-08 22:29       ` Olof Johansson
2019-11-08 22:29         ` Olof Johansson
2018-04-03  2:00 Stephen Rothwell
2018-04-03  2:00 ` Stephen Rothwell
2015-08-17  1:08 Stephen Rothwell
2015-08-17  1:08 ` 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=Y5is9cp6WdWixwgU@orome \
    --to=treding@nvidia.com \
    --cc=Sergey.Semin@baikalelectronics.ru \
    --cc=arnd@arndb.de \
    --cc=bhelgaas@google.com \
    --cc=helgaas@kernel.org \
    --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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.