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

Merge branch 'pci/hotplug'

  - Remove unused pciehp EMI() and HP_SUPR_RM() macros (Ani Sinha)

  - Use of_node_name_eq() for node name comparisons (Rob Herring)

  - Convert shpchp_unconfigure_device() to void (Krzysztof Wilczynski)

* pci/hotplug:
  PCI: shpchp: Make shpchp_unconfigure_device() void
  PCI: Use of_node_name_eq() for node name comparisons
  PCI: pciehp: Remove unused EMI() and HP_SUPR_RM() macros
---

1a765adf33531d5665fd69098be70ddc1047d644