Merge tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Apr 2022 17:31:00 +0000 (10:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Apr 2022 17:31:00 +0000 (10:31 -0700)
commit63d12cc30574eec9241932cefa17a21df3afd8d0
treeb2e02d9586a86b9e94812b8c1936f77a777bf703
parent5dee87215b2c539e7b82704d56f610a4e558b9cc
parent4fe87e818ea492ade079cc01a31d088e445f8539
Merge tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping

Pull more dma-mapping updates from Christoph Hellwig:

 - fix a regression in dma remap handling vs AMD memory encryption (me)

 - finally kill off the legacy PCI DMA API (Christophe JAILLET)

* tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: move pgprot_decrypted out of dma_pgprot
  PCI/doc: cleanup references to the legacy PCI DMA API
  PCI: Remove the deprecated "pci-dma-compat.h" API