Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jun 2019 01:38:34 +0000 (15:38 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jun 2019 01:38:34 +0000 (15:38 -1000)
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

1  2 
drivers/xen/swiotlb-xen.c

Simple merge