Merge tag 'dma-mapping-5.10-1' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Oct 2020 19:17:05 +0000 (12:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Oct 2020 19:17:05 +0000 (12:17 -0700)
commit1b307ac87075c3207c345822ea276fe4f28481d7
tree8d3b04cc685b4dd8d34e9decbae0ba1bb5e8647b
parent9bf8d8bcf3cebe44863188f1f2d822214e84f5b1
parent6857a5ebaabc5b9d989872700b4b71dd2a6d6453
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