diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-07 12:56:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-07 12:56:23 -0800 |
| commit | 1d8b0e79083d229829a408cd016dc4a038f637dd (patch) | |
| tree | 120e466200b31570e59357c0da9ebc1eb938fc5f /block/blk-merge.c | |
| parent | 2626820d838f9e98f323bf47b4fb7722d1c52e53 (diff) | |
| parent | 164afb1d85b872907cfac048b46c094db596d529 (diff) | |
| download | linux-stable-1d8b0e79083d229829a408cd016dc4a038f637dd.tar.gz linux-stable-1d8b0e79083d229829a408cd016dc4a038f637dd.tar.bz2 linux-stable-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/blk-merge.c')
0 files changed, 0 insertions, 0 deletions