linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the devicetree tree with the pci tree
@ 2020-05-22  5:58 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2020-05-22  5:58 UTC (permalink / raw)
  To: Rob Herring, Bjorn Helgaas
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Kishon Vijay Abraham I, Lorenzo Pieralisi

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

Hi all,

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

  Documentation/devicetree/bindings/pci/cdns-pcie.yaml

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.

-- 
Cheers,
Stephen Rothwell

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the pci tree
  2021-10-29  2:24 Stephen Rothwell
@ 2021-10-29 13:45 ` Rob Herring
  0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2021-10-29 13:45 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Bjorn Helgaas, Linux Kernel Mailing List,
	Linux Next Mailing List, Lorenzo Pieralisi, Simon Xue

On Thu, Oct 28, 2021 at 9:24 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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've dropped it from my tree.

Rob

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the devicetree tree with the pci tree
@ 2021-10-29  2:24 Stephen Rothwell
  2021-10-29 13:45 ` Rob Herring
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2021-10-29  2:24 UTC (permalink / raw)
  To: Rob Herring, Bjorn Helgaas
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Lorenzo Pieralisi, Rob Herring, Simon Xue

[-- 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 --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the pci tree
  2020-07-28  8:26 ` Sivaprakash Murugesan
@ 2020-07-28 15:20   ` Rob Herring
  0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2020-07-28 15:20 UTC (permalink / raw)
  To: Sivaprakash Murugesan
  Cc: Stephen Rothwell, Bjorn Helgaas, Linux Next Mailing List,
	Linux Kernel Mailing List, Ansuel Smith, Lorenzo Pieralisi

On Tue, Jul 28, 2020 at 2:28 AM Sivaprakash Murugesan
<sivaprak@codeaurora.org> wrote:
>
> On 7/28/2020 11:19 AM, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in:
> >
> >    Documentation/devicetree/bindings/pci/qcom,pcie.txt
> >
> > between commits:
> >
> >    736ae5c91712 ("dt-bindings: PCI: qcom: Add missing clks")
> >    b11b8cc161de ("dt-bindings: PCI: qcom: Add ext reset")
> >    d511580ea9c2 ("dt-bindings: PCI: qcom: Add ipq8064 rev 2 variant")
> >
> > from the pci tree and commit:
> >
> >    70172d196947 ("dt-bindings: pci: convert QCOM pci bindings to YAML")
> >
> > from the devicetree tree.
> >
> > I don;t know how to fixed it up so I just left the latter one . 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.
>
> Rob/Bjorn,
>
> Please let me know if I can provide a patch rebased to linux-next.

A patch based on linux-next is useless unless you want it applied
after the next merge window because no one can apply it.

> Bjorn can pick up the patch after review and Rob can drop the old pci
> yaml conversion patch.

I'll drop it and it can go via the PCI tree. I have some minor fixups
I'll comment on.

Rob

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: linux-next: manual merge of the devicetree tree with the pci tree
  2020-07-28  5:49 Stephen Rothwell
@ 2020-07-28  8:26 ` Sivaprakash Murugesan
  2020-07-28 15:20   ` Rob Herring
  0 siblings, 1 reply; 7+ messages in thread
From: Sivaprakash Murugesan @ 2020-07-28  8:26 UTC (permalink / raw)
  To: Stephen Rothwell, Rob Herring, Bjorn Helgaas
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Ansuel Smith,
	Lorenzo Pieralisi

On 7/28/2020 11:19 AM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>    Documentation/devicetree/bindings/pci/qcom,pcie.txt
>
> between commits:
>
>    736ae5c91712 ("dt-bindings: PCI: qcom: Add missing clks")
>    b11b8cc161de ("dt-bindings: PCI: qcom: Add ext reset")
>    d511580ea9c2 ("dt-bindings: PCI: qcom: Add ipq8064 rev 2 variant")
>
> from the pci tree and commit:
>
>    70172d196947 ("dt-bindings: pci: convert QCOM pci bindings to YAML")
>
> from the devicetree tree.
>
> I don;t know how to fixed it up so I just left the latter one . 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.

Rob/Bjorn,

Please let me know if I can provide a patch rebased to linux-next.

Bjorn can pick up the patch after review and Rob can drop the old pci 
yaml conversion patch.

let me know your thoughts.

>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* linux-next: manual merge of the devicetree tree with the pci tree
@ 2020-07-28  5:49 Stephen Rothwell
  2020-07-28  8:26 ` Sivaprakash Murugesan
  0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2020-07-28  5:49 UTC (permalink / raw)
  To: Rob Herring, Bjorn Helgaas
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Sivaprakash Murugesan, Ansuel Smith, Lorenzo Pieralisi

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

Hi all,

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

  Documentation/devicetree/bindings/pci/qcom,pcie.txt

between commits:

  736ae5c91712 ("dt-bindings: PCI: qcom: Add missing clks")
  b11b8cc161de ("dt-bindings: PCI: qcom: Add ext reset")
  d511580ea9c2 ("dt-bindings: PCI: qcom: Add ipq8064 rev 2 variant")

from the pci tree and commit:

  70172d196947 ("dt-bindings: pci: convert QCOM pci bindings to YAML")

from the devicetree tree.

I don;t know how to fixed it up so I just left the latter one . 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] 7+ messages in thread

* linux-next: manual merge of the devicetree tree with the pci tree
@ 2018-01-25 20:34 Stephen Rothwell
  0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2018-01-25 20:34 UTC (permalink / raw)
  To: Rob Herring, Bjorn Helgaas
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List

Hi Rob,

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

  drivers/of/Kconfig

between commit:

  4670d610d592 ("PCI: Move OF-related PCI functions into PCI core")

from the pci tree and commit:

  6019a3d07d72 ("of: enable unittests on UML")

from the devicetree tree.

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

diff --cc drivers/of/Kconfig
index ee244c2e8c2b,06898039d11e..000000000000
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@@ -61,7 -63,11 +63,7 @@@ config OF_DYNAMI
  
  config OF_ADDRESS
  	def_bool y
- 	depends on !SPARC && HAS_IOMEM
+ 	depends on !SPARC && (HAS_IOMEM || UML)
 -	select OF_ADDRESS_PCI if PCI
 -
 -config OF_ADDRESS_PCI
 -	bool
  
  config OF_IRQ
  	def_bool y

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-10-29 13:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22  5:58 linux-next: manual merge of the devicetree tree with the pci tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
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

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