From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 May 2019 01:45:27 +0000 (-0700)
Subject: Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.2-rc1~146
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=498e8631f27ed649bd3e31998a00b2b9b288cf3a;p=users%2Fhch%2Fmisc.git

Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb updates from Konrad Rzeszutek Wilk:
 "Cleanups in the swiotlb code and extra debugfs knobs to help with the
  field diagnostics"

* 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb-xen: ensure we have a single callsite for xen_dma_map_page
  swiotlb-xen: simplify the DMA sync method implementations
  swiotlb-xen: use ->map_page to implement ->map_sg
  swiotlb-xen: make instances match their method names
  swiotlb: save io_tlb_used to local variable before leaving critical section
  swiotlb: dump used and total slots when swiotlb buffer is full
---

498e8631f27ed649bd3e31998a00b2b9b288cf3a