Subject: linux-next: manual merge of the devicetree tree with the pci tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 Jan 2022 11:50:22 +1100

Hi all,

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

  Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml

between commit:

  d91e775e661f ("dt-bindings: PCI: ti,am65: Fix "ti,syscon-pcie-id"/"ti,syscon-pcie-mode" to take argument")

from the pci tree and commit:

  dcd49679fb3a ("dt-bindings: PCI: Fix 'unevaluatedProperties' warnings")

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 Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml
index 98d933b792e7,a6896cb40e83..000000000000
--- a/Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml
+++ b/Documentation/devicetree/bindings/pci/ti,am65-pci-ep.yaml
@@@ -69,9 -65,7 +69,7 @@@ examples
                 <0x5506000 0x1000>;
          reg-names = "app", "dbics", "addr_space", "atu";
          power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>;
 -        ti,syscon-pcie-mode = <&pcie0_mode>;
 +        ti,syscon-pcie-mode = <&scm_conf 0x4060>;
-         num-ib-windows = <16>;
-         num-ob-windows = <16>;
          max-link-speed = <2>;
          dma-coherent;
          interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;