projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 366a4e3 8492101)
Merge branch 'for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jul 2019 18:48:05 +0000 (11:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Jul 2019 18:48:05 +0000 (11:48 -0700)
commitd4df33b0e9925c158b313a586fb1557cf29cfdf4
tree181f956b71cec41398123ce65711e26563e9458ftree | snapshot
parent366a4e38b8d0d3e8c7673ab5c1b5e76bbfbc0085commit | diff
parent8492101e15f9e2d30ab3533563d94590bb01c09ccommit | diff
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()
drivers/xen/swiotlb-xen.c diff1 | diff2 | blob | history
kernel/dma/swiotlb.c diff1 | diff2 | blob | history
John Crispins staging tree