From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 24 Oct 2020 19:17:05 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.15~2568
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b307ac87075c3207c345822ea276fe4f28481d7;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:

 - document the new dma_{alloc,free}_pages() API

 - two fixups for the dma-mapping.h split

* tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: document dma_{alloc,free}_pages
  dma-mapping: move more functions to dma-map-ops.h
  ARM/sa1111: add a missing include of dma-map-ops.h
---

1b307ac87075c3207c345822ea276fe4f28481d7