| commit | d4df33b0e9925c158b313a586fb1557cf29cfdf4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 18 11:48:05 2019 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jul 18 11:48:05 2019 -0700 |
| tree | 181f956b71cec41398123ce65711e26563e9458f | |
| parent | 366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085 [diff] | |
| parent | 8492101e15f9e2d30ab3533563d94590bb01c09c [diff] |
Merge branch 'for-linus-5.2' of git://git.kernel.org/pub/scm/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()