OSDN Git Service

Merge branch 'pci/resource'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:25 +0000 (10:56 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:25 +0000 (10:56 -0500)
commit131e4f76c9ae9636046bf04d19d43af0e4ae9807
tree2a7a8843c095d2689099fb2bfa2da6b7eea5ede8
parent76d826c32f88a1c39bc51cf262db48b4babc7414
parent65db04053efea3f3e412a7e0cc599962999c96b4
Merge branch 'pci/resource'

- Coalesce host bridge apertures so we can allocate large BARs that cross
  contiguous apertures (Kai-Heng Feng)

* pci/resource:
  PCI: Coalesce host bridge contiguous apertures
drivers/pci/probe.c