From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 18 Jul 2019 18:48:05 +0000 (-0700)
Subject: Merge branch 'for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad... 
X-Git-Tag: v5.3-rc1~40
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d4df33b0e9925c158b313a586fb1557cf29cfdf4;p=linux-block.git

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

Pull swiotlb updates from Konrad Rzeszutek Wilk:
 "One compiler fix, and a bug-fix in swiotlb_nr_tbl() and
  swiotlb_max_segment() to check also for no_iotlb_memory"

* 'for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: fix phys_addr_t overflow warning
  swiotlb: Return consistent SWIOTLB segments/nr_tbl
  swiotlb: Group identical cleanup in swiotlb_cleanup()
---

d4df33b0e9925c158b313a586fb1557cf29cfdf4