]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Mar 2017 18:23:17 +0000 (10:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Mar 2017 18:23:17 +0000 (10:23 -0800)
commit116d68bcd8c72cfb540ae576eef9f389285cc29b
treec28ac6bfc83c198b2a61515694d05ad22f2cc25a
parentd5889f4c97a3ac7fac1c58ed095894a378746802
parent0cdbcca32aa26e39c74d0f18da72a9cbcbc61491
Merge branch 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

Pull swiotlb updates from Konrad Rzeszutek Wilk:
 "Two tiny implementations of the DMA API for callback in ARM (for Xen)"

* 'stable/for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
  swiotlb-xen: implement xen_swiotlb_get_sgtable callback
  swiotlb-xen: implement xen_swiotlb_dma_mmap callback
arch/arm/xen/mm.c
drivers/xen/swiotlb-xen.c