From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Apr 2019 15:25:16 +0000 (-0700)
Subject: Merge tag 'dma-mapping-5.1-1' of git://git.infradead.org/users/hch/dma-mapping
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8ee15f3248660f85102a47410079d408615723d4;p=linux.git

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

Pull dma-mapping fixes from Christoph Hellwig:
 "Fix a sparc64 sun4v_pci regression introduced in this merged window,
  and a dma-debug stracktrace regression from the big refactor last
  merge window"

* tag 'dma-mapping-5.1-1' of git://git.infradead.org/users/hch/dma-mapping:
  dma-debug: only skip one stackframe entry
  sparc64/pci_sun4v: fix ATU checks for large DMA masks
---

8ee15f3248660f85102a47410079d408615723d4