From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 15 Dec 2020 21:11:06 +0000 (-0600)
Subject: Merge branch 'pci/enumeration'
X-Git-Tag: v5.11-rc1~149^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e8722508dd78609b453b960d0b8163749d1f78b8;p=thirdparty%2Flinux.git

Merge branch 'pci/enumeration'

- Decode PCIe 64 GT/s link speed (Gustavo Pimentel)

- De-duplicate Device IDs in the driver dynamic IDs list (Zhenzhong Duan)

- Return u8 from pci_find_capability() and similar (Puranjay Mohan)

- Return u16 from pci_find_ext_capability() and similar (Bjorn Helgaas)

- Include both device and resource name in config space resources
  (Alexander Lobakin)

- Fix ACPI companion lookup for device 0 on the root bus (Rafael J.
  Wysocki)

* pci/enumeration:
  PCI/ACPI: Fix companion lookup for device 0 on the root bus
  PCI: Keep both device and resource name for config space remaps
  PCI: Return u16 from pci_find_ext_capability() and similar
  PCI: Return u8 from pci_find_capability() and similar
  PCI: Avoid duplicate IDs in driver dynamic IDs list
  PCI: Move pci_match_device() ahead of new_id_store()
  PCI: Decode PCIe 64 GT/s link speed
---

e8722508dd78609b453b960d0b8163749d1f78b8