]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 23:52:23 +0000 (15:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2016 23:52:23 +0000 (15:52 -0800)
commit2cc841dffebb39cf53f73ae6a9231f26495c89ee
tree3b8d4483b8ce6d1ea997cde2c89445564cba7b0f
parent500bac7d5452c9dc3f237d71998dc9611c97bbb3
parentaffa0c7e6f14f9ccb3e52077d9fb3cda052946d7
Merge branch 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb updates from Konrad Rzeszutek Wilk:

 - minor fixes (rate limiting), remove certain functions

 - support for DMA_ATTR_SKIP_CPU_SYNC which is an optimization
   in the DMA API

* 'stable/for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb: Minor fix-ups for DMA_ATTR_SKIP_CPU_SYNC support
  swiotlb: Add support for DMA_ATTR_SKIP_CPU_SYNC
  swiotlb-xen: Enforce return of DMA_ERROR_CODE in mapping function
  swiotlb: Drop unused functions swiotlb_map_sg and swiotlb_unmap_sg
  swiotlb: Rate-limit printing when running out of SW-IOMMU space