From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 24 Feb 2021 20:59:19 +0000 (-0600)
Subject: Merge branch 'pci/host-probe-refactor'
X-Git-Tag: v5.15~1639^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=617e3a8bc7c2270dd192cc1e5ca14c6664206149;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'pci/host-probe-refactor'

- Fix merge botch in cdns_pcie_host_map_dma_ranges() (Krzysztof Wilczyński)

* pci/host-probe-refactor:
  PCI: cadence: Fix DMA range mapping early return error
---

617e3a8bc7c2270dd192cc1e5ca14c6664206149