From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Apr 2022 17:31:00 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.18-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=63d12cc30574eec9241932cefa17a21df3afd8d0;p=linux.git

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

63d12cc30574eec9241932cefa17a21df3afd8d0