From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sat, 10 Dec 2022 16:36:39 +0000 (-0600)
Subject: Merge branch 'remotes/lorenzo/pci/vmd'
X-Git-Tag: v6.2-rc1~93^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba7deaa2a8e48d8a31608b5dca58dbe119c0d72a;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'remotes/lorenzo/pci/vmd'

- Restore MSI remapping configuration during resume because the
  configuration is cleared out by firmware when suspending (Nirmal Patel)

- Reset the hierarchy below VMD when probing the VMD; we attempted this
  before, but with the wrong device, so it didn't work (Francisco Munoz)

* remotes/lorenzo/pci/vmd:
  PCI: vmd: Fix secondary bus reset for Intel bridges
  PCI: vmd: Disable MSI remapping after suspend
---

ba7deaa2a8e48d8a31608b5dca58dbe119c0d72a