From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 4 May 2021 15:43:22 +0000 (-0500)
Subject: Merge branch 'pci/hotplug'
X-Git-Tag: baikal/aarch64/sdk6.1~6674^2~24
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=dd290e754612ae9114e9c8d52c752afe888963f7;p=kernel.git

Merge branch 'pci/hotplug'

- Fix acpiphp reference count leak (Feilong Lin)

* pci/hotplug:
  PCI: acpiphp: Fix whitespace issue
  PCI: shpchp: Remove unused shpc_writeb()
  PCI: cpqphp: Use DEFINE_SPINLOCK() for int15_lock
  ACPI / hotplug / PCI: Fix reference count leak in enable_slot()
---

dd290e754612ae9114e9c8d52c752afe888963f7