From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Dec 2018 02:16:17 +0000 (-0800)
Subject: Merge tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Tag: v5.4-rc1~2046
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dd516ff7d852c2cda8c5b883d6625d1c812714e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fix from Christoph Hellwig:
 "Fix a regression in dma-direct that didn't take account the magic AMD
  memory encryption mask in the DMA address"

* tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping:
  dma-direct: do not include SME mask in the DMA supported check
---

2dd516ff7d852c2cda8c5b883d6625d1c812714e