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)
commit4d8f5f91b8a608980b173ef3382913c7405f82c3
tree7d069289cecbdac63fcdf08faba1f0bdad6d4ca3
parentc23b07125f8aebf8b39fffa325145826098f7d8f
parent4e7372e0dc5d7d2078fbdb13505635cd5b11f93d
Merge branch 'stable/for-linus-5.2' of git://git./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
drivers/xen/swiotlb-xen.c