From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 12 Jun 2019 01:38:34 +0000 (-1000)
Subject: Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.2-rc5~24
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Flinux.git;a=commitdiff_plain;h=4d8f5f91b8a608980b173ef3382913c7405f82c3

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

Pull swiotlb fix from Konrad Rzeszutek Wilk:
 "One tiny fix for ARM64 where we could allocate the SWIOTLB twice"

* 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  xen/swiotlb: don't initialize swiotlb twice on arm64
---

4d8f5f91b8a608980b173ef3382913c7405f82c3