From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 17 Apr 2025 23:00:31 +0000 (-0700)
Subject: Merge tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
X-Git-Tag: v6.15-rc3~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc96b232f8e7c0a6c282f47726b2ff6a5fb341d2;p=thirdparty%2Flinux.git

Merge tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

Pull pci fix from Bjorn Helgaas:

 - Revert a reset patch that broke VFIO passthrough because devices
   ended up with no available reset mechanisms (Alex Williamson)

* tag 'pci-v6.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  Revert "PCI: Avoid reset when disabled via sysfs"
---

fc96b232f8e7c0a6c282f47726b2ff6a5fb341d2