Message ID | 20200605202257.GA1152522@bjorn-Precision-5520 |
---|---|
State | New |
Headers | show |
Series | [GIT,PULL] PCI changes for v5.8 | expand |
On Fri, Jun 5, 2020 at 1:23 PM Bjorn Helgaas <helgaas@kernel.org> wrote: > > You should see two conflicts: > > 2) Documentation/devicetree/bindings/pci/cdns-pcie.yaml: conflict > between Rob's 3d21a4609335 ("dt-bindings: Remove cases of 'allOf' > containing a '$ref'") and Kishon's fb5f8f3ca5f8 ("dt-bindings: PCI: > cadence: Deprecate inbound/outbound specific bindings"). > > Kishon moved a hunk from cdns-pcie.yaml to cdns-pcie-ep.yaml and > cdns-pcie-host.yaml, so I think the new homes need Rob's change: > > Documentation/devicetree/bindings/pci/cdns-pcie-ep.yaml > Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml I decided not to touch those two files, because the AllOf rules seem strange, and not all were updated anyway, so I'm going to leave it to others (ie Rob) to decide how they want to handle it. I suspect your resolution is correct, but I also suspect it doesn't _matter_, and since I don't understand the yaml rules I'll leave it alone. Rob? Linus
The pull request you sent on Fri, 5 Jun 2020 15:22:57 -0500:
> git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git tags/pci-v5.8-changes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/3925c3bbdf886f1ddf64461b9b380e1bb36f90c1
Thank you!
diff --cc Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml index cb4e700c0269,3d64f85aeb39..303078a7b7a8 --- a/Documentation/devicetree/bindings/pci/cdns-pcie-host.yaml diff --cc drivers/pci/quirks.c index ca9ed5774eb1,97df1f90160d..812bfc32ecb8 --- a/drivers/pci/quirks.c