From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 22 Mar 2022 22:16:21 +0000 (-0500)
Subject: Merge branch 'pci/misc'
X-Git-Tag: howlett/maple/20220722_2~916^2~15
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=73c82469bd88ce1c9a4403f34582e544e77f4854;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'pci/misc'

- Update the aer-inject URL (Yicong Yang)

- Declare pci_filp_private only when HAVE_PCI_MMAP to avoid unused struct
  definition (Krzysztof Wilczyński)

- Remove unused assignments (Bjorn Helgaas)

- Add #includes to asm/pci_x86.h to prevent build errors (Randy Dunlap)

* pci/misc:
  x86/PCI: Add #includes to asm/pci_x86.h
  PCI: ibmphp: Remove unused assignments
  PCI: cpqphp: Remove unused assignments
  PCI: fu740: Remove unused assignments
  PCI: kirin: Remove unused assignments
  PCI: Remove unused assignments
  PCI: Declare pci_filp_private only when HAVE_PCI_MMAP
  PCI/AER: Update aer-inject URL
---

73c82469bd88ce1c9a4403f34582e544e77f4854