diff options
| author | Linus Torvalds <[email protected]> | 2019-07-18 18:48:05 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-07-18 18:48:05 +0000 |
| commit | d4df33b0e9925c158b313a586fb1557cf29cfdf4 (patch) | |
| tree | 181f956b71cec41398123ce65711e26563e9458f /net/tipc/node.c | |
| parent | Merge tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| parent | Merge branch 'stable/for-linus-5.2' into devel/for-linus-5.2 (diff) | |
| download | kernel-d4df33b0e9925c158b313a586fb1557cf29cfdf4.tar.gz kernel-d4df33b0e9925c158b313a586fb1557cf29cfdf4.zip | |
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()
Diffstat (limited to 'net/tipc/node.c')
0 files changed, 0 insertions, 0 deletions