Merge branch 'remotes/lorenzo/pci/ftpci100'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:29 +0000 (10:56 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 6 Jul 2021 15:56:29 +0000 (10:56 -0500)
commit777e5e6ba918ec4109e87f86b9ca1689565b659d
treebfdedb1c3a2bf047ac39873e01fe9dcf1ff2cbfe
parentc04881e8c4a354a3c81a0a58aaf2556975ce80e7
parent5be967d5016ac5ffb9c4d0df51b48441ee4d5ed1
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