| commit | 37cea93b99d2d89bef3adcb4632d71e1f377c447 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 15 Jan 2016 21:01:01 +0000 (15 13:01 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 15 Jan 2016 21:01:01 +0000 (15 13:01 -0800) | ||
| tree | 62ebd3c1d28bec1d99b09ce9a968094e2e57dbb7 | treesnapshot (tar.gz zip) |
| parent | cc80fe0eefbbbd7b4e32f631bb2fa639d76af075 | commitdiff |
| parent | d4f50ee2f5b45fc4d9e4142a52edf8b7935a9275 | commitdiff |
Merge tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Fixes in AMD xgbe reset, spapr structure padding, type 1 flags (Dan
Carpenter, Alexey Kardashevskiy, Pierre Morel)
- Re-introduce no-iommu mode, with a user this time (Alex Williamson)
* tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio:
vfio/iommu_type1: make use of info.flags
vfio: Include No-IOMMU mode
vfio: Add explicit alignments in vfio_iommu_spapr_tce_create
VFIO: platform: reset: fix a warning message condition
Pull VFIO updates from Alex Williamson:
- Fixes in AMD xgbe reset, spapr structure padding, type 1 flags (Dan
Carpenter, Alexey Kardashevskiy, Pierre Morel)
- Re-introduce no-iommu mode, with a user this time (Alex Williamson)
* tag 'vfio-v4.5-rc1' of git://github.com/awilliam/linux-vfio:
vfio/iommu_type1: make use of info.flags
vfio: Include No-IOMMU mode
vfio: Add explicit alignments in vfio_iommu_spapr_tce_create
VFIO: platform: reset: fix a warning message condition