commit 299af12a7270f098d714e1625634a453e6846411
author Bjorn Helgaas <bhelgaas@google.com> Wed Oct 21 09:58:37 2020 -0500
committer Bjorn Helgaas <bhelgaas@google.com> Wed Oct 21 09:58:37 2020 -0500
tree 69c60e29058a81ebb66375c5e6315f8e5b2e0150
parent 03b482e2432c48a8108fc7159ce42ee4d60ca393
parent f5810e5c329238b8553ebd98b914bdbefd8e6737

Merge branch 'remotes/lorenzo/pci/pci-iomap'

- Remove useless __KERNEL__ preprocessor guard in sparc io_32.h (Lorenzo
  Pieralisi)

- Move ioremap/iounmap declaration so it's visible in asm-generic/io.h
  (Lorenzo Pieralisi)

- Fix memory leak in generic !CONFIG_GENERIC_IOMAP pci_iounmap()
  implementation (Lorenzo Pieralisi)

* remotes/lorenzo/pci/pci-iomap:
  asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() implementation
  sparc32: Move ioremap/iounmap declaration before asm-generic/io.h include
  sparc32: Remove useless io_32.h __KERNEL__ preprocessor guard