diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 12:10:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 12:10:58 -0800 |
| commit | 3aebae061cea6f6627ab882a73de7b0b21af3127 (patch) | |
| tree | 4ea296a2b63b38e69e37434e7976b45cfc816c0d | |
| parent | 9d1d166f18f8f0f332573b8d2e28e5b3291f09c5 (diff) | |
| parent | bd00fdf198e2da475a2f4265a83686ab42d998a8 (diff) | |
Merge tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio
Pull VFIO fix from Alex Williamson:
"mdev IOMMU groups are not yet compatible with the powerpc SPAPR IOMMU
backend, detect and fail group attach (Greg Kurz)"
* tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio:
vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null
| parent | fd7c99142d77dc4a851879a66715abf12a3193fb (diff) | |
|---|---|---|
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile bugfix from Chris Metcalf:
"This avoids an issue with short userspace reads for regset via ptrace"
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile/ptrace: Preserve previous registers for short regset write
Diffstat (limited to 'include/uapi/video')