From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 5 Nov 2021 16:28:42 +0000 (-0500)
Subject: Merge branch 'pci/acpi'
X-Git-Tag: v5.16-rc1~105^2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d55770b68538d1ea96bd21061851ac093251598;p=thirdparty%2Flinux.git

Merge branch 'pci/acpi'

- Simplify _OSC negotiation with platform for control of PCIe features
  (Joerg Roedel)

* pci/acpi:
  PCI/ACPI: Check for _OSC support in acpi_pci_osc_control_set()
  PCI/ACPI: Move _OSC query checks to separate function
  PCI/ACPI: Move supported and control calculations to separate functions
  PCI/ACPI: Remove OSC_PCI_SUPPORT_MASKS and OSC_PCI_CONTROL_MASKS
---

8d55770b68538d1ea96bd21061851ac093251598