diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 06:49:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 06:49:24 -0400 |
| commit | 27a9716bc80448f7e98fb1fb316daba241a4c539 (patch) | |
| tree | d9a82dc1e1eddd1ff2a27d558149ad8323975134 /fs/gfs2/rgrp.c | |
| parent | Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux (diff) | |
| parent | vfio-pci: Fix remove path locking (diff) | |
| download | linux-dev-27a9716bc80448f7e98fb1fb316daba241a4c539.tar.xz linux-dev-27a9716bc80448f7e98fb1fb316daba241a4c539.zip | |
Merge tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio
Pull VFIO updates from Alex Williamson:
- Nested IOMMU extension to type1 (Will Deacon)
- Restore MSIx message before enabling (Gavin Shan)
- Fix remove path locking (Alex Williamson)
* tag 'vfio-v3.18-rc1' of git://github.com/awilliam/linux-vfio:
vfio-pci: Fix remove path locking
drivers/vfio: Export vfio_spapr_iommu_eeh_ioctl() with GPL
vfio/pci: Restore MSIx message prior to enabling
PCI: Export MSI message relevant functions
vfio/iommu_type1: add new VFIO_TYPE1_NESTING_IOMMU IOMMU type
iommu: introduce domain attribute for nesting IOMMUs
Diffstat (limited to 'fs/gfs2/rgrp.c')
0 files changed, 0 insertions, 0 deletions