From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 21 Oct 2020 14:58:34 +0000 (-0500)
Subject: Merge branch 'pci/enumeration'
X-Git-Tag: Ubuntu-5.13.0-19.19~4781^2~24
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=28a18aec59551e0f86f0983c0eec7b6470632790;p=mirror_ubuntu-jammy-kernel.git

Merge branch 'pci/enumeration'

- Tone down message about missing optional MCFG (Jeremy Linton)

- Add schedule point in pci_read_config() (Jiang Biao)

- Add Ampere Altra SOC MCFG quirk (Tuan Phan)

- Add Kconfig options for MPS/MRRS strategy (Jim Quinlan)

* pci/enumeration:
  PCI: Add Kconfig options for MPS/MRRS strategy
  PCI/ACPI: Add Ampere Altra SOC MCFG quirk
  PCI: Add schedule point in pci_read_config()
  PCI/ACPI: Tone down missing MCFG message
---

28a18aec59551e0f86f0983c0eec7b6470632790