diff options
| author | Linus Torvalds | 2015-05-11 11:09:54 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2015-05-11 11:09:54 -0700 |
| commit | a156e0682f5b328094c273435a46e32e100ba898 (patch) | |
| tree | c62f7dbd7d099dee057ff629779f51997441178b /block/blk-ioc.c | |
| parent | 9c922a55dbfff812e8becbcfd90d1ce856adb0d9 (diff) | |
| parent | 5dc5616ee850eaba055bb469a6c4a471d489140e (diff) | |
Merge tag 'iommu-fixes-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
"Three fixes have queued up:
- reference count fix in the AMD IOMMUv2 driver
- sign extension fix in the ARM-SMMU driver
- build fix for rockchip driver with device tree"
* tag 'iommu-fixes-v4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/arm-smmu: Fix sign-extension of upstream bus addresses at stage 1
iommu/rockchip: Fix build without CONFIG_OF
iommu/amd: Fix bug in put_pasid_state_wait
Diffstat (limited to 'block/blk-ioc.c')
0 files changed, 0 insertions, 0 deletions