From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 Apr 2026 17:50:04 +0000 (-0500)
Subject: Merge branch 'pci/pwrctrl'
X-Git-Tag: v7.1-rc1~151^2~25
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=85d9948d59efad0833139f11c3e07fa25c688b12;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/pwrctrl'

- Rename 'slot' driver to 'generic' since it can handle any device with
  individual power control as well as slots (Neil Armstrong)

- Add UPD720201/UPD720202 USB 3.0 xHCI Host Controller .compatible so
  generic pwrctrl driver can control it (Neil Armstrong)

* pci/pwrctrl:
  PCI/pwrctrl: generic: Add UPD720201/UPD720202 USB 3.0 xHCI Host Controller support
  PCI/pwrctrl: generic: Simplify dev_err_probe() usage
  PCI/pwrctrl: generic: Rename pci-pwrctrl-slot as generic
---

85d9948d59efad0833139f11c3e07fa25c688b12