From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 6 Jul 2021 15:56:29 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/ftpci100'
X-Git-Tag: v5.14-rc1~44^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=777e5e6ba918ec4109e87f86b9ca1689565b659d;p=thirdparty%2Flinux.git

Merge branch 'remotes/lorenzo/pci/ftpci100'

- Rename PCI_IOSIZE, etc in ftpci100 to avoid macro name collisions (Randy
  Dunlap)

* remotes/lorenzo/pci/ftpci100:
  PCI: ftpci100: Rename macro name collision
---

777e5e6ba918ec4109e87f86b9ca1689565b659d