From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 4 Jun 2020 17:59:18 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/pci-bridge-emul'
X-Git-Tag: v5.8-rc1~115^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c521b7d5b8047ee7d1800cea003831fb790b5019;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'remotes/lorenzo/pci/pci-bridge-emul'

  - Fix conflicts in pci-bridge-emul descriptions of Device Status and Slot
    Control (Jon Derrick)

  - Add emulation for more Device Status, Link Control, and Slot Control
    bits (Jon Derrick)

  - Improve emulation of reserved bits (Jon Derrick)

* remotes/lorenzo/pci/pci-bridge-emul:
  PCI: pci-bridge-emul: Eliminate the 'reserved' member
  PCI: pci-bridge-emul: Update for PCIe 5.0 r1.0
  PCI: pci-bridge-emul: Fix Root Cap/Status comment
  PCI: pci-bridge-emul: Fix PCIe bit conflicts
---

c521b7d5b8047ee7d1800cea003831fb790b5019