From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 21 Oct 2020 14:58:37 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/pci-iomap'
X-Git-Tag: v5.15~2606^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=299af12a7270f098d714e1625634a453e6846411;p=platform%2Fkernel%2Flinux-starfive.git

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
---

299af12a7270f098d714e1625634a453e6846411