diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-07 21:56:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-07 21:56:23 +0100 |
commit | 1d8b0e79083d229829a408cd016dc4a038f637dd (patch) | |
tree | 120e466200b31570e59357c0da9ebc1eb938fc5f /block | |
parent | Merge tag 'trace-v4.4-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | iommu/dma: Use correct offset in map_sg (diff) | |
download | linux-1d8b0e79083d229829a408cd016dc4a038f637dd.tar.xz linux-1d8b0e79083d229829a408cd016dc4a038f637dd.zip |
Merge tag 'iommu-fixes-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
- Two build issues, one in the ipmmu-vmsa driver and one for the new
generic dma-api implemention used on arm64
- A performance fix for said dma-api implemention
- An issue caused by a wrong offset in map_sg in the same code as above
* tag 'iommu-fixes-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/dma: Use correct offset in map_sg
iommu/ipmmu-vmsa: Don't truncate ttbr if LPAE is not enabled
iommu/dma: Avoid unlikely high-order allocations
iommu/dma: Add some missing #includes
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions