| commit | 44953afbea29760bfcb1f2bd42a244072e0dadec | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 05 10:14:51 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 05 10:14:51 2015 -0700 |
| tree | bd6ed34a3fe75e98a5099e22bd8f1713f000aba3 | |
| parent | 51d0f0cb3ae0da0ce5bb0bff8d1305345e6ec7ec [diff] | |
| parent | 2d0ec7a19b5796aa958636eeeff072b506460501 [diff] |
Merge tag 'iommu-fixes-v4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fix from Joerg Roedel:
"Only one patch:
- Revert "iommu/amd: Don't allocate with __GFP_ZERO in
alloc_coherent".
This patch caused problems with some drivers, so it is better to
revert it now until the drivers have been fixed"
* tag 'iommu-fixes-v4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
Revert "iommu/amd: Don't allocate with __GFP_ZERO in alloc_coherent"